resolve conflict

Signed-off-by: crazycs <[email protected]>
pingcap · Jul 5, 2021 · 61b83c0 · 61b83c0
1 parent 50f3f32
commit 61b83c0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/util/stmtsummary/statement_summary_test.go b/util/stmtsummary/statement_summary_test.go
@@ -30,11 +30,7 @@ import (
 	"github.com/pingcap/tidb/store/tikv"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/execdetails"
-<<<<<<< HEAD
-=======
 	"github.com/pingcap/tidb/util/plancodec"
-	"github.com/tikv/client-go/v2/util"
->>>>>>> c4424c292... util/stmtsummary: discard the plan if it is too long and enlarge the tidb_stmt_summary_max_stmt_count value to 3000 (#25843)
 )
 
 var _ = Suite(&testStmtSummarySuite{})