fix

Signed-off-by: Ryan Leung <[email protected]>
tikv · Aug 27, 2024 · 07ca0ee · 07ca0ee
1 parent fa644ae
commit 07ca0ee
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/server/api/label_test.go b/server/api/label_test.go
@@ -22,11 +22,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/stretchr/testify/suite"
-<<<<<<< HEAD
-=======
 	"github.com/tikv/pd/pkg/core"
-	"github.com/tikv/pd/pkg/response"
->>>>>>> c8ad186c3 (server: skip the engine key when match store label (#8486))
 	tu "github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/config"