update temp

cosdt · Aug 26, 2024 · 83de0cf · 83de0cf
1 parent 81c422b
commit 83de0cf
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
@@ -266,14 +266,6 @@ jobs:
           set: ${{ inputs.set }}
           provenance: false
           sbom: false
-<<<<<<< Updated upstream
-          set: ${{ inputs.set }}
-        env:
-          registries: ${{ inputs.registries }}
-=======
-        env:
-          registries: ${{ steps.list-registries.outputs.registries }}
->>>>>>> Stashed changes
 
       - name: Export metadata
         id: export