Resolve conflicts

BytomDAO · Oct 21, 2017 · bb8198b · bb8198b
2 parents 66fb5bb + 94fa4ba
commit bb8198b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/blockchain/account/indexer.go b/blockchain/account/indexer.go
@@ -1,9 +1,9 @@
 package account
 
 import (
+	"time"
 	"context"
 	"encoding/json"
-	"time"
 
 	"github.com/bytom/blockchain/query"
 	"github.com/bytom/blockchain/signers"