From 1ac1fa2d640335eaa0337c1878615d19de21dba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek@users.noreply.github.com>
Date: Mon, 26 Jun 2023 11:36:53 +0200
Subject: [PATCH] fix merge conflict

---
 .github/workflows/docker-release.yaml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
index a73e2d5..6c3a935 100644
--- a/.github/workflows/docker-release.yaml
+++ b/.github/workflows/docker-release.yaml
@@ -22,31 +22,18 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-<<<<<<< HEAD
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-=======
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
->>>>>>> aba9ea0 (adjust Dockerfile & add Dependabot & CI)
 
       - name: Docker metadata action
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: |
-<<<<<<< HEAD
-            monotek/cvdupdate
-=======
             ghcr.io/${{ github.repository_owner }}/cvdupdate
->>>>>>> aba9ea0 (adjust Dockerfile & add Dependabot & CI)
           tags: |
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
             type=ref,event=branch