Fix accidental rebase mistake

NOAA-GSL · Feb 13, 2024 · a212dc0 · a212dc0
1 parent 6510018
commit a212dc0
Showing 1 changed file with 0 additions and 64 deletions.
diff --git a/.github/workflows/package-cleanup.yaml b/.github/workflows/package-cleanup.yaml
@@ -20,125 +20,61 @@ jobs:
         with: 
           package-name: 'exascaleworkflowsandbox/spack-stack-gnu-openmpi'
           package-type: 'container'
-<<<<<<< HEAD
-<<<<<<< HEAD
           min-versions-to-keep: 0
-=======
-          min-versions-to-keep: 1
->>>>>>> 8d44464 (Add GitHub workflow to remove untagged container packages)
-=======
-          min-versions-to-keep: 0
->>>>>>> ac88847 (Don't keep any untagged package versions)
           delete-only-untagged-versions: 'true'
       -
         name: Remove untagged versions of exascaleworkflowsandbox/frontend
         uses: actions/delete-package-versions@v4
         with: 
           package-name: 'exascaleworkflowsandbox/frontend'
           package-type: 'container'
-<<<<<<< HEAD
-<<<<<<< HEAD
-          min-versions-to-keep: 0
-=======
-          min-versions-to-keep: 1
->>>>>>> 8d44464 (Add GitHub workflow to remove untagged container packages)
-=======
           min-versions-to-keep: 0
->>>>>>> ac88847 (Don't keep any untagged package versions)
           delete-only-untagged-versions: 'true'
       -
         name: Remove untagged versions of exascaleworkflowsandbox/master
         uses: actions/delete-package-versions@v4
         with: 
           package-name: 'exascaleworkflowsandbox/master'
           package-type: 'container'
-<<<<<<< HEAD
-<<<<<<< HEAD
           min-versions-to-keep: 0
-=======
-          min-versions-to-keep: 1
->>>>>>> 8d44464 (Add GitHub workflow to remove untagged container packages)
-=======
-          min-versions-to-keep: 0
->>>>>>> ac88847 (Don't keep any untagged package versions)
           delete-only-untagged-versions: 'true'
       -
         name: Remove untagged versions of exascaleworkflowsandbox/node
         uses: actions/delete-package-versions@v4
         with: 
           package-name: 'exascaleworkflowsandbox/node'
           package-type: 'container'
-<<<<<<< HEAD
-<<<<<<< HEAD
-          min-versions-to-keep: 0
-=======
-          min-versions-to-keep: 1
->>>>>>> 8d44464 (Add GitHub workflow to remove untagged container packages)
-=======
           min-versions-to-keep: 0
->>>>>>> ac88847 (Don't keep any untagged package versions)
           delete-only-untagged-versions: 'true'
       -
         name: Remove untagged versions of exascaleworkflowsandbox/flux-cache-amd64
         uses: actions/delete-package-versions@v4
         with: 
           package-name: 'exascaleworkflowsandbox/flux-cache-amd64'
           package-type: 'container'
-<<<<<<< HEAD
-<<<<<<< HEAD
           min-versions-to-keep: 0
-=======
-          min-versions-to-keep: 1
->>>>>>> 8d44464 (Add GitHub workflow to remove untagged container packages)
-=======
-          min-versions-to-keep: 0
->>>>>>> ac88847 (Don't keep any untagged package versions)
           delete-only-untagged-versions: 'true'
       -
         name: Remove untagged versions of exascaleworkflowsandbox/flux-cache-arm64
         uses: actions/delete-package-versions@v4
         with: 
           package-name: 'exascaleworkflowsandbox/flux-cache-arm64'
           package-type: 'container'
-<<<<<<< HEAD
-<<<<<<< HEAD
-          min-versions-to-keep: 0
-=======
-          min-versions-to-keep: 1
->>>>>>> 8d44464 (Add GitHub workflow to remove untagged container packages)
-=======
           min-versions-to-keep: 0
->>>>>>> ac88847 (Don't keep any untagged package versions)
           delete-only-untagged-versions: 'true'
       -
         name: Remove untagged versions of exascaleworkflowsandbox/spack-stack-gnu-openmpi-cache-amd64
         uses: actions/delete-package-versions@v4
         with: 
           package-name: 'exascaleworkflowsandbox/spack-stack-gnu-openmpi-cache-amd64'
           package-type: 'container'
-<<<<<<< HEAD
-<<<<<<< HEAD
           min-versions-to-keep: 0
-=======
-          min-versions-to-keep: 1
->>>>>>> 8d44464 (Add GitHub workflow to remove untagged container packages)
-=======
-          min-versions-to-keep: 0
->>>>>>> ac88847 (Don't keep any untagged package versions)
           delete-only-untagged-versions: 'true'
       -
         name: Remove untagged versions of exascaleworkflowsandbox/spack-stack-gnu-openmpi-cache-arm64
         uses: actions/delete-package-versions@v4
         with: 
           package-name: 'exascaleworkflowsandbox/spack-stack-gnu-openmpi-cache-arm64'
           package-type: 'container'
-<<<<<<< HEAD
-<<<<<<< HEAD
-          min-versions-to-keep: 0
-=======
-          min-versions-to-keep: 1
->>>>>>> 8d44464 (Add GitHub workflow to remove untagged container packages)
-=======
           min-versions-to-keep: 0
->>>>>>> ac88847 (Don't keep any untagged package versions)
           delete-only-untagged-versions: 'true'