Merge branch 'master' of https://github.com/irisnet/irishub into sile…

…i/release0.8
irisnet · Dec 13, 2018 · 78f92d4 · 78f92d4
2 parents 177325d + c903c32
commit 78f92d4
Show file tree

Hide file tree

Showing 36 changed files with 660 additions and 358 deletions.
diff --git a/cmd/irismon/main.go b/cmd/irismon/main.go
@@ -4,10 +4,10 @@ import (
 	"os"
 
 	"github.com/irisnet/irishub/app"
-	irisInit "github.com/irisnet/irishub/init"
 	"github.com/irisnet/irishub/tools/prometheus"
 	"github.com/spf13/cobra"
 	"github.com/tendermint/tendermint/libs/cli"
+	irisInit "github.com/irisnet/irishub/init"
 )
 
 func init() {