From 9315c39cdcf39032b0df7c70a6def8d333cc3db4 Mon Sep 17 00:00:00 2001
From: Colin Griffin <colin@krum.io>
Date: Thu, 30 Mar 2023 18:49:14 -0400
Subject: [PATCH] enable push

---
 .github/workflows/docker-build-push-dockerhub.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/docker-build-push-dockerhub.yml b/.github/workflows/docker-build-push-dockerhub.yml
index ae7f6ef..d45fe23 100644
--- a/.github/workflows/docker-build-push-dockerhub.yml
+++ b/.github/workflows/docker-build-push-dockerhub.yml
@@ -95,7 +95,11 @@ jobs:
         with:
           context: ./
           file: ./Dockerfile
+<<<<<<< HEAD
           push: ${{ github.event_name != 'pull_request' }}
+=======
+          push: true
+>>>>>>> f652dce (enable push)
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}