fix merge conflict

Signed-off-by: deepthi <[email protected]>
vitessio · Nov 10, 2023 · 8e56bc3 · 8e56bc3
1 parent c21c77e
commit 8e56bc3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
@@ -8,12 +8,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-<<<<<<< HEAD
         os: [ubuntu-22.04]
-        topo: [consul,etcd,k8s]
-=======
         topo: [consul,etcd,zk2]
->>>>>>> 1a9119d089 (examples: fix flag syntax for zkctl (#14469))
 
     steps:
     - name: Skip CI