From d5b14b61367b5891cc2e39a5f1a21f58b2011cc5 Mon Sep 17 00:00:00 2001
From: jsanchez556 <joma116@hotmail.com>
Date: Thu, 3 Oct 2024 08:20:27 -0600
Subject: [PATCH] GitHub Action for DockerHub build and publish #19

---
 .github/workflows/docker-publish.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 1e128bfe..dc0ce3a9 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -10,11 +10,7 @@ jobs:
   build_and_push:
     env:
       DOCKER_HUB: ${{ secrets.DOCKER_LOGIN }}
-<<<<<<< HEAD
-      DOCKER_TAGS: type=ref,event=branch,branch=master,latest=true
-=======
       DOCKER_TAGS: latest
->>>>>>> 89a6b58 (GitHub Action for DockerHub build and publish #19)
     runs-on: ubuntu-22.04
     permissions:
       id-token: write