glide update and rebase fixes

cosmos · Apr 21, 2017 · 9d620e4 · 9d620e4
1 parent 34fc383
commit 9d620e4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 60 deletions.
diff --git a/cmd/commands/utils.go b/cmd/commands/utils.go
@@ -5,9 +5,6 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"regexp"
-	"strconv"
-	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"

diff --git a/cmd/counter/cmd.go b/cmd/counter/cmd.go
@@ -35,7 +35,7 @@ func init() {
 
 func counterTxCmd(cmd *cobra.Command, args []string) error {
 
-	countFee, err := commands.ParseCoins(countFeeFlag)
+	countFee, err := types.ParseCoins(countFeeFlag)
 	if err != nil {
 		return err
 	}

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,24 +1,24 @@
 package: github.com/tendermint/basecoin
 import:
 - package: github.com/tendermint/go-common
-  version: master
+  version: develop
 - package: github.com/tendermint/go-crypto
-  version: master
+  version: develop
 - package: github.com/tendermint/go-events
-  version: master
+  version: develop
 - package: github.com/tendermint/go-logger
-  version: master
+  version: develop
 - package: github.com/tendermint/go-data
-  version: master
+  version: develop
 - package: github.com/tendermint/go-rpc
   version: develop
 - package: github.com/tendermint/go-wire
-  version: master
+  version: develop
 - package: github.com/tendermint/merkleeyes
-  version: master
+  version: develop
 - package: github.com/tendermint/tendermint
-  version: viper
+  version: develop
 - package: github.com/tendermint/abci
-  version: master
+  version: develop
 - package: github.com/gorilla/websocket
   version: v1.1.0