From 3f9e521d93af0edf6198d127371e48fa32422991 Mon Sep 17 00:00:00 2001
From: BornChanger <97348524+BornChanger@users.noreply.github.com>
Date: Fri, 13 Dec 2024 21:17:39 +0800
Subject: [PATCH] Update BUILD.bazel

---
 br/pkg/streamhelper/BUILD.bazel | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/br/pkg/streamhelper/BUILD.bazel b/br/pkg/streamhelper/BUILD.bazel
index f40883028b2b9..ac350fd9774b6 100644
--- 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",