Fix merge

celo-org · Mar 19, 2024 · 2915d42 · 2915d42
1 parent 57bb70b
commit 2915d42
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/.github/workflows/add-docker-tag.yaml b/.github/workflows/add-docker-tag.yaml
@@ -29,28 +29,15 @@ jobs:
       contents: 'read'
       id-token: 'write'
     steps:
-<<<<<<< HEAD
-      - id: 'auth-gcp-master'
-        name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v2'
-=======
       - id: auth-gcp-master
         name: Authenticate to Google Cloud
         uses: google-github-actions/auth@v2
->>>>>>> 74c5f920c (Refactor container workflows)
         with:
           workload_identity_provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-blockchain-add-tag/providers/github-by-repos'
           service_account: '[email protected]'
           access_token_lifetime: '10m'
 
-<<<<<<< HEAD
-      - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v2'
-
-      - id: add-tag-devopsre
-=======
       - name: Install regctl
->>>>>>> 74c5f920c (Refactor container workflows)
         run: |
           curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-amd64 > regctl
           chmod 755 regctl