save file

microsoft · Jun 19, 2024 · 3c32711 · 3c32711
1 parent 3b8236d
commit 3c32711
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
@@ -12,19 +12,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-<<<<<<< HEAD
-=======
-    - name: Azure Container Registry Login
-      uses: Azure/docker-login@v2
-      with:
-        # Container registry username
-        username: ${{ secrets.SAMPLEAPP_ACR_USERNAME }}
-        # Container registry password
-        password: ${{ secrets.SAMPLEAPP_ACR_PASSWORD }}
-        # Container registry server url
-        login-server: sampleappaoaichatgpt.azurecr.io
-
->>>>>>> bd16c6488eba124cb4536eac7b4b85faf17f043a
     - uses: actions/checkout@v3
     - name: Build the Docker image
       run: