fix merge conflict

Cisco-Talos · Jun 26, 2023 · 1ac1fa2 · 1ac1fa2
1 parent b83532d
commit 1ac1fa2
Showing 1 changed file with 0 additions and 13 deletions.
diff --git 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