Resolve the conflicts

Signed-off-by: JmPotato <ghzpotato@gmail.com>
tikv · Aug 5, 2024 · 9f100ce · 9f100ce
1 parent 456fa93
commit 9f100ce
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/tests/integrations/client/http_client_test.go b/tests/integrations/client/http_client_test.go
@@ -451,15 +451,11 @@ func (suite *httpClientTestSuite) checkRegionLabel(mode mode, client pd.Client)
 	re.Equal(labelRule.ID, allLabelRules[1].ID)
 	re.Equal(labelRule.Labels, allLabelRules[1].Labels)
 	re.Equal(labelRule.RuleType, allLabelRules[1].RuleType)
-<<<<<<< HEAD
-	labelRules, err = client.GetRegionLabelRulesByIDs(env.ctx, []string{"keyspaces/0", "rule2"})
-=======
-	labelRules, err = client.GetRegionLabelRulesByIDs(ctx, []string{"rule2"})
+	labelRules, err = client.GetRegionLabelRulesByIDs(env.ctx, []string{"rule2"})
 	re.NoError(err)
 	re.Len(labelRules, 1)
 	re.Equal(labelRule, labelRules[0])
-	labelRules, err = client.GetRegionLabelRulesByIDs(ctx, []string{"keyspaces/0", "rule2"})
->>>>>>> 838ee7983 (client/http: fix the URI of GetRegionLabelRulesByIDs (#8490))
+	labelRules, err = client.GetRegionLabelRulesByIDs(env.ctx, []string{"keyspaces/0", "rule2"})
 	re.NoError(err)
 	sort.Slice(labelRules, func(i, j int) bool {
 		return labelRules[i].ID < labelRules[j].ID