Fixes dangling merge conflicts from 2.4.

SimonRichardson · Nov 22, 2018 · 11c872c · 11c872c
1 parent 53d1bf2
commit 11c872c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 136 deletions.
diff --git a/README.md b/README.md
@@ -105,12 +105,8 @@ install dependencies and other features.  It is advisable, when installing
 
 Juju needs some dependencies in order to be installed and the preferred way to
 collect the necessary packages is to use the provided `Makefile`.
-<<<<<<< HEAD
-The target `dep` will download the go packages listed in `Gopkg.lock`. The following bash code will install the dependencies.
-=======
-The target `godeps` will download the go packages listed in `dependencies.tsv`.
+The target `dep` will download the go packages listed in `Gopkg.lock`.
 The following bash code will install the dependencies.
->>>>>>> upstream/2.4
 
     cd $GOPATH/src/github.com/juju/juju
     export JUJU_MAKE_GODEPS=true

diff --git a/patches/mgo_6_insert_remove_pr4.diff b/patches/mgo_6_insert_remove_pr4.diff