From 00f2cb059e333252fb8d3eaad3d21ae2c61b2b5d Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Thu, 7 Sep 2023 10:38:14 +0300
Subject: [PATCH] Adapt to v15

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
---
 go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go b/go/test/endtoend/onlineddl/vrepl/onlineddl_vrepl_test.go
index 439bf9ff3ee..118488c63b1 100644
--- 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) {