Fix conflict

Signed-off-by: Matt Lord <[email protected]>
vitessio · Oct 11, 2023 · 41c1411 · 41c1411
1 parent 4061339
commit 41c1411
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/examples/compose/vtcompose/vtcompose.go b/examples/compose/vtcompose/vtcompose.go
@@ -533,13 +533,8 @@ func generateDefaultShard(tabAlias int, shard string, keyspaceData keyspaceInfo,
 - op: add
   path: /services/init_shard_primary%[2]d
   value:
-<<<<<<< HEAD
     image: vitess/lite:v18.0.0-rc1
-    command: ["sh", "-c", "/vt/bin/vtctlclient %[5]s InitShardPrimary -force %[4]s/%[3]s %[6]s-%[2]d "]
-=======
-    image: vitess/lite:${VITESS_TAG:-latest}
     command: ["sh", "-c", "/vt/bin/vtctldclient %[5]s InitShardPrimary --force %[4]s/%[3]s %[6]s-%[2]d "]
->>>>>>> 8d7b507a2a (Move all examples to vtctldclient (#14226))
     %[1]s
 `, dependsOn, aliases[0], shard, keyspaceData.keyspace, opts.topologyFlags, opts.cell)
 }