fix conflicts

Signed-off-by: Ryan Leung <[email protected]>
ti-chi-bot · Jul 22, 2024 · 4f147c8 · 4f147c8
1 parent c1b8865
commit 4f147c8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pkg/keyspace/keyspace.go b/pkg/keyspace/keyspace.go
@@ -31,11 +31,7 @@ import (
 	"github.com/tikv/pd/pkg/slice"
 	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/storage/kv"
-<<<<<<< HEAD
-=======
-	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
->>>>>>> 2d8e03f33 (*: fix redact log (#8415))
 	"github.com/tikv/pd/pkg/utils/syncutil"
 	"go.uber.org/zap"
 )