Merge branch 'develop' into bez/1269-basecoind-start-failure

2018-07-02 18:59:34 -04:00
parent 61ce80135a f48881d3a2
commit e3e58435eb
83 changed files with 217 additions and 267 deletions
@@ -8,10 +8,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
+	"github.com/tendermint/tendermint/libs/cli"
+	dbm "github.com/tendermint/tendermint/libs/db"
+	"github.com/tendermint/tendermint/libs/log"
 	tmtypes "github.com/tendermint/tendermint/types"
-	"github.com/tendermint/tmlibs/cli"
-	dbm "github.com/tendermint/tmlibs/db"
-	"github.com/tendermint/tmlibs/log"
 )

 func main() {