diff --git a/server/api/label_test.go b/server/api/label_test.go index 68b5a07b618..04c98858ac3 100644 --- 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"