fix conflict

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
tikv · Mar 27, 2023 · 6a31075 · 6a31075
1 parent eaf86ca
commit 6a31075
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/server/schedule/region_scatterer_test.go b/server/schedule/region_scatterer_test.go
@@ -609,12 +609,7 @@ func TestRegionHasLearner(t *testing.T) {
 
 // TestSelectedStoresTooFewPeers tests if the peer count has changed due to the picking strategy.
 // Ref https://github.com/tikv/pd/issues/4565
-<<<<<<< HEAD
 func (s *testScatterRegionSuite) TestSelectedStores(c *C) {
-=======
-func TestSelectedStoresTooFewPeers(t *testing.T) {
-	re := require.New(t)
->>>>>>> f5b5391c0 (region_scatterer: fix the bug that could generate schedule with too many peers (#5920))
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	opt := config.NewTestOptions()