Merge change in .github/workflows/ovs-build-and-push.yml

platform9 · Nov 25, 2024 · 671836c · 671836c
1 parent 0e84b71
commit 671836c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/ovs-build-and-push.yml b/.github/workflows/ovs-build-and-push.yml
@@ -44,11 +44,7 @@ jobs:
           password: ${{ env.PASSWORD }}
 
       - name: Build/Push image to Quay Container Registry
-<<<<<<< HEAD
         uses: docker/build-push-action@v6
-=======
-        uses: docker/build-push-action@v3
->>>>>>> 08c9617 (Create GitHub workflows to build luigi and openvswitch image)
         with:
           context: hostplumber/pkg/ovs-docker
           tags: quay.io/platform9/openvswitch:${{ env.TAG }}-${{ github.run_number }}