Overlooked a conflict, now fixed

jonasbn · Aug 31, 2024 · 13c776f · 13c776f
1 parent c62235b
commit 13c776f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
@@ -6,12 +6,7 @@ jobs:
     name: Spellcheck
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - uses: rojopolis/[email protected]
-=======
-    - uses: actions/checkout@v4
-    - uses: rojopolis/[email protected]
->>>>>>> 024796f139ee1630f7f2c58aad7fe8cba3f2403d
       name: Spellcheck