Fix rebase conflict

qdm12 · qdm12 · commit 08c1a736e587 · 2022-05-30T14:59:19.000Z
diff --git a/lib/grandpa/message_tracker.go b/lib/grandpa/message_tracker.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/ChainSafe/gossamer/dot/types"
-	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/libp2p/go-libp2p-core/peer"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"time"`
`9`	`9`
`10`	`10`	`"github.com/ChainSafe/gossamer/dot/types"`
`11`		`- "github.com/ChainSafe/gossamer/lib/common"`
`12`	`11`	`"github.com/libp2p/go-libp2p-core/peer"`
`13`	`12`	`)`
`14`	`13`