fix merge issues

somramnani · Nov 9, 2023 · 78220c7 · 78220c7
1 parent e21c730
commit 78220c7
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,12 +1,6 @@
 name: CI/CD Pipeline
 
-<<<<<<< HEAD
-on:
-  push: [push]
-
-=======
 on: [push]
->>>>>>> 3cc0c28e8d418d08676a5d9e5efb3b3077863da3
 jobs:
   build:
     runs-on: ubuntu-latest