From 671836cd06c9f35cb9e9adc63ed8965b3ed8a558 Mon Sep 17 00:00:00 2001
From: cruizen <trilok@platform9.com>
Date: Mon, 25 Nov 2024 20:17:58 +0530
Subject: [PATCH] Merge change in .github/workflows/ovs-build-and-push.yml

---
 .github/workflows/ovs-build-and-push.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ovs-build-and-push.yml b/.github/workflows/ovs-build-and-push.yml
index 1df3d605..ce1cde54 100644
--- 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 }}