Adapt to v15

Signed-off-by: Shlomi Noach <[email protected]>
vitessio · Sep 7, 2023 · 00f2cb0 · 00f2cb0
1 parent b681260
commit 00f2cb0
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go b/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go
@@ -756,15 +756,9 @@ func TestSchemaChange(t *testing.T) {
 			}
 		})
 	})
-<<<<<<< HEAD
-=======
-	t.Run("summary: validate sequential migration IDs", func(t *testing.T) {
-		onlineddl.ValidateSequentialMigrationIDs(t, &vtParams, shards)
-	})
 	t.Run("summary: validate completed_timestamp", func(t *testing.T) {
 		onlineddl.ValidateCompletedTimestamp(t, &vtParams)
 	})
->>>>>>> f71583b6ef (OnlineDDL: fix nil 'completed_timestamp' for cancelled migrations (#13928))
 }
 
 func insertRow(t *testing.T) {