From 3c498925e10eb3f23220827cd071d3848891c2e7 Mon Sep 17 00:00:00 2001
From: Marin Salinas <marinssalinas@gmail.com>
Date: Fri, 19 Apr 2019 12:44:52 -0500
Subject: [PATCH] chore: remove dep steps and fix merge leftover

---
 README.md | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 539931825..aa1e6acfd 100644
--- a/README.md
+++ b/README.md
@@ -158,28 +158,6 @@ We'll be working with HashiCorp as code stabilizes to upstream this properly, at
 
 [](https://github.com/golang/go)
 
-#### Dep: Go dependency management tool
-
-On MacOS you can install or upgrade to the latest released version with Homebrew:
-
-```sh
-$ brew install dep
-$ brew upgrade dep
-```
-
-On other platforms you can use the `install.sh` script:
-
-```sh
-$ curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-```
-
-It will install into your `$GOPATH/bin` directory by default or any other directory you specify using the `INSTALL_DIRECTORY` environment variable.
-
-If your platform is not supported, you'll need to build it manually or let the team (go/dep team) know and we'll consider adding your platform
-to the release builds.
-
-More Info: https://github.com/golang/dep
-
 ## Install from source
 
 ## Building from sources
@@ -200,14 +178,7 @@ More Info: https://github.com/golang/dep
     go get -u github.com/golang/dep/cmd/dep
     ```
 
-5. Get dependencies:
-
-    ```bash
-    cd $GOPATH/src/github.com/terraform-providers/terraform-provider-nutanix
-    dep ensure
-    ```
-
-6. Run tests:
+5. Run tests:
 
     ```bash
     cd $GOPATH/src/github.com/terraform-providers/terraform-provider-nutanix
@@ -215,7 +186,7 @@ More Info: https://github.com/golang/dep
     make testacc #acceptance tests
     ```
 
-7. Build the binary:
+6. Build the binary:
 
     ```bash
     cd $GOPATH/src/github.com/terraform-providers/terraform-provider-nutanix
@@ -271,11 +242,6 @@ Clone repository to: `$GOPATH/src/github.com/terraform-providers/terraform-provi
 
 ```sh
 $ mkdir $GOPATH/src/github.com/terraform-providers && cd "$_" #if you already created it only change directory
-<<<<<<< HEAD
-
-=======
-$
->>>>>>> chore: fix bad urls in readme.md file
 $ git clone https://github.com/terraform-providers/terraform-provider-nutanix.git
 ```