Update ebs.go

pingcap · Aug 28, 2024 · bd4304a · bd4304a
1 parent 1edf7eb
commit bd4304a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/br/pkg/aws/ebs.go b/br/pkg/aws/ebs.go
@@ -20,10 +20,6 @@ import (
 	"github.com/pingcap/tidb/br/pkg/config"
 	"github.com/pingcap/tidb/br/pkg/glue"
 	"github.com/pingcap/tidb/br/pkg/utils"
-<<<<<<< HEAD
-=======
-	"github.com/pingcap/tidb/pkg/util"
->>>>>>> 035f79e896b (br: fix get snapshot response pointer deref panic (#54510))
 	"go.uber.org/atomic"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"