From dd16823198271bca9b530bd0ee48e8dbc1e02ef3 Mon Sep 17 00:00:00 2001
From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Date: Thu, 7 Sep 2023 10:26:30 +0300
Subject: [PATCH] resolve conflict

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

diff --git a/go/test/endtoend/onlineddl/vtgate_util.go b/go/test/endtoend/onlineddl/vtgate_util.go
index b6514e3d438..1b6def8ecf4 100644
--- a/go/test/endtoend/onlineddl/vtgate_util.go
+++ b/go/test/endtoend/onlineddl/vtgate_util.go
@@ -35,12 +35,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-<<<<<<< HEAD
-=======
-const (
-	ThrottledAppsTimeout = 60 * time.Second
-)
-
 var (
 	testsStartupTime time.Time
 )
@@ -49,7 +43,6 @@ func init() {
 	testsStartupTime = time.Now()
 }
 
->>>>>>> f71583b6ef (OnlineDDL: fix nil 'completed_timestamp' for cancelled migrations (#13928))
 // VtgateExecQuery runs a query on VTGate using given query params
 func VtgateExecQuery(t *testing.T, vtParams *mysql.ConnParams, query string, expectError string) *sqltypes.Result {
 	t.Helper()
@@ -359,8 +352,6 @@ func WaitForThrottledTimestamp(t *testing.T, vtParams *mysql.ConnParams, uuid st
 	t.Error("timeout waiting for last_throttled_timestamp to have nonempty value")
 	return
 }
-<<<<<<< HEAD
-=======
 
 // ValidateSequentialMigrationIDs validates that schem_migrations.id column, which is an AUTO_INCREMENT, does
 // not have gaps
@@ -426,4 +417,3 @@ func ValidateCompletedTimestamp(t *testing.T, vtParams *mysql.ConnParams) {
 	}
 	assert.NotZero(t, completedTimestampNumValidations)
 }
->>>>>>> f71583b6ef (OnlineDDL: fix nil 'completed_timestamp' for cancelled migrations (#13928))