Update BUILD.bazel

pingcap · Dec 13, 2024 · 3f9e521 · 3f9e521
1 parent 04c3c40
commit 3f9e521
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/br/pkg/streamhelper/BUILD.bazel b/br/pkg/streamhelper/BUILD.bazel
@@ -69,11 +69,7 @@ go_test(
     ],
     flaky = True,
     race = "on",
-<<<<<<< HEAD
-    shard_count = 33,
-=======
-    shard_count = 35,
->>>>>>> e3248e76b56 (log backup: use global checkpoint ts as source of truth (#58135))
+    shard_count = 34,
     deps = [
         ":streamhelper",
         "//br/pkg/errors",