,.

Signed-off-by: AilinKid <[email protected]>
pingcap · Feb 19, 2024 · e9c7933 · e9c7933
1 parent bcc1d2a
commit e9c7933
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/pkg/executor/test/executor/BUILD.bazel b/pkg/executor/test/executor/BUILD.bazel
@@ -8,11 +8,7 @@ go_test(
         "main_test.go",
     ],
     flaky = True,
-<<<<<<< HEAD
     shard_count = 50,
-=======
-    shard_count = 47,
->>>>>>> 423834132da (parser, planner: fix embedded setOprStmt will be seen as SetOprSelectList item and lost its orderBy and Limit (#49421))
     deps = [
         "//pkg/config",
         "//pkg/ddl",

diff --git a/pkg/planner/core/casetest/physicalplantest/BUILD.bazel b/pkg/planner/core/casetest/physicalplantest/BUILD.bazel
@@ -10,11 +10,7 @@ go_test(
     data = glob(["testdata/**"]),
     flaky = True,
     race = "on",
-<<<<<<< HEAD
     shard_count = 50,
-=======
-    shard_count = 31,
->>>>>>> 423834132da (parser, planner: fix embedded setOprStmt will be seen as SetOprSelectList item and lost its orderBy and Limit (#49421))
     deps = [
         "//pkg/config",
         "//pkg/domain",