resolve conflicts

Signed-off-by: hillium <[email protected]>
pingcap · Dec 25, 2023 · 90b9360 · 90b9360
1 parent 4d1e2de
commit 90b9360
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/br/pkg/utils/BUILD.bazel b/br/pkg/utils/BUILD.bazel
@@ -90,11 +90,7 @@ go_test(
     ],
     embed = [":utils"],
     flaky = True,
-<<<<<<< HEAD
     shard_count = 29,
-=======
-    shard_count = 38,
->>>>>>> 7b8c876800e (log_backup: add lock for truncating (#49469))
     deps = [
         "//br/pkg/errors",
         "//br/pkg/metautil",

diff --git a/br/pkg/utils/misc.go b/br/pkg/utils/misc.go
@@ -21,14 +21,9 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	berrors "github.com/pingcap/tidb/br/pkg/errors"
-<<<<<<< HEAD
 	"github.com/pingcap/tidb/parser/mysql"
 	"github.com/pingcap/tidb/parser/types"
-=======
-	"github.com/pingcap/tidb/pkg/parser/mysql"
-	"github.com/pingcap/tidb/pkg/parser/types"
 	"go.uber.org/multierr"
->>>>>>> 7b8c876800e (log_backup: add lock for truncating (#49469))
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )

diff --git a/br/pkg/utils/misc_test.go b/br/pkg/utils/misc_test.go
@@ -18,14 +18,9 @@ import (
 	"testing"
 	"time"
 
-<<<<<<< HEAD
+	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/parser/mysql"
 	"github.com/pingcap/tidb/parser/types"
-=======
-	"github.com/pingcap/errors"
-	"github.com/pingcap/tidb/pkg/parser/mysql"
-	"github.com/pingcap/tidb/pkg/parser/types"
->>>>>>> 7b8c876800e (log_backup: add lock for truncating (#49469))
 	"github.com/stretchr/testify/require"
 	"go.uber.org/multierr"
 )