fix merge conflict lost in the shuffle

gabe-lyons · Nov 1, 2022 · 08f9921 · 08f9921
1 parent 3bcc2d7
commit 08f9921
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/.github/workflows/delete-artifacts.yaml b/.github/workflows/delete-artifacts.yaml
@@ -12,14 +12,7 @@ jobs:
     timeout-minutes: 10
 
     steps:
-<<<<<<< HEAD
-    - name: Remove old artifacts
-      uses: c-hive/gha-remove-artifacts@v1
-      with:
-        age: '1 second'
-=======
       - name: Remove old artifacts
         uses: c-hive/gha-remove-artifacts@v1
         with:
           age: "1 second"
->>>>>>> master