Resolved conflict

Signed-off-by: Shlomi Noach <[email protected]>
vitessio · Sep 20, 2023 · c5a96c0 · c5a96c0
1 parent 8adae78
commit c5a96c0
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/go/vt/schema/ddl_strategy_test.go b/go/vt/schema/ddl_strategy_test.go
@@ -302,23 +302,13 @@ func TestParseDDLStrategy(t *testing.T) {
 			runtimeOptions:   "",
 			cutOverThreshold: 5 * time.Minute,
 		},
-<<<<<<< HEAD
-=======
 		{
 			strategyVariable: "vitess --retain-artifacts=4m",
 			strategy:         DDLStrategyVitess,
 			options:          "--retain-artifacts=4m",
 			runtimeOptions:   "",
 			expireArtifacts:  4 * time.Minute,
 		},
-		{
-			strategyVariable: "vitess --analyze-table",
-			strategy:         DDLStrategyVitess,
-			options:          "--analyze-table",
-			runtimeOptions:   "",
-			analyzeTable:     true,
-		},
->>>>>>> 0461fafbd2 (OnlineDDL: cleanup cancelled migration artifacts; support `--retain-artifacts=<duration>` DDL strategy flag (#14029))
 	}
 	for _, ts := range tt {
 		t.Run(ts.strategyVariable, func(t *testing.T) {