resolve conflicts

pingcap · Jun 2, 2020 · 66fc20a · 66fc20a
1 parent 29e152e
commit 66fc20a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/bindinfo/bind_test.go b/bindinfo/bind_test.go
@@ -1098,8 +1098,6 @@ func (s *testSuite) TestReCreateBindAfterEvolvePlan(c *C) {
 	tk.MustQuery("select * from t where a >= 4 and b >= 1")
 	c.Assert(tk.Se.GetSessionVars().StmtCtx.IndexNames[0], Equals, "t:idx_b")
 }
-<<<<<<< HEAD
-=======
 
 func (s *testSuite) TestInvisibleIndex(c *C) {
 	tk := testkit.NewTestKit(c, s.store)
@@ -1185,4 +1183,3 @@ func (s *testSuite) TestbindingSource(c *C) {
 	bind = bindData.Bindings[0]
 	c.Assert(bind.Source, Equals, bindinfo.Capture)
 }
->>>>>>> 7ca3d9c... bindinfo, record how bindings are created in SQL bindings. (#17254)