From 8b83b249f18ce370b000c85ef19efbe391ab6aee Mon Sep 17 00:00:00 2001
From: Jan Stabenow <moin@jan-stabenow.de>
Date: Thu, 21 Jul 2022 23:01:29 +0200
Subject: [PATCH] Fix dev workflow

---
 .github/workflows/build_base_alpine_dev.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build_base_alpine_dev.yaml b/.github/workflows/build_base_alpine_dev.yaml
index 4bfa58ff..6ad2d588 100644
--- a/.github/workflows/build_base_alpine_dev.yaml
+++ b/.github/workflows/build_base_alpine_dev.yaml
@@ -81,12 +81,9 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new
-<<<<<<< HEAD
   dockerBundle:
     uses: ./.github/workflows/build_bundle_dev.yaml
     secrets: inherit
   dockerBundleRpi:
     uses: ./.github/workflows/build_bundle-rpi_dev.yaml
     secrets: inherit
-=======
->>>>>>> dev