Through careful use of the [overide] directive this now builds

evan-forbes · Mar 8, 2018 · 3ff9363 · 3ff9363
1 parent 6441202
commit 3ff9363
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 52 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -41,9 +41,9 @@
   name = "github.com/pkg/errors"
   version = "0.8.0"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/rigelrozanski/common"
+# [[constraint]]
+#   branch = "master"
+#   name = "github.com/rigelrozanski/common"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
@@ -65,19 +65,19 @@
   branch = "master"
   name = "github.com/tendermint/go-crypto"
 
-[[constraint]]
+[[override]]
   branch = "master"
   name = "github.com/tendermint/go-wire"
 
 [[constraint]]
   branch = "master"
   name = "github.com/tendermint/iavl"
 
-[[override]]
+[[constraint]]
   branch = "develop"
   name = "github.com/tendermint/tendermint"
 
-[[constraint]]
+[[override]]
   branch = "develop"
   name = "github.com/tendermint/tmlibs"