merge main

JonathanTreffler · Jun 17, 2024 · 1c542d2 · 1c542d2
1 parent 971e187
commit 1c542d2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -24,7 +24,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+<<<<<<< HEAD
         dockerfile: [ubuntu22, ubuntu20, ubuntu18, alpine]
+=======
+        dockerfile: [ubuntu22, ubuntu20, ubuntu18]
+>>>>>>> main
         include:
           - dockerfile: ubuntu22
             tags: |
@@ -36,8 +40,11 @@ jobs:
             tags: ubuntu20
           - dockerfile: ubuntu18
             tags: ubuntu18
+<<<<<<< HEAD
           - dockerfile: alpine
             tags: alpine
+=======
+>>>>>>> main
 
     steps:
       - name: Checkout repository