fix merge conflict

Signed-off-by: svrnm <[email protected]>
svrnm · Aug 7, 2024 · 33d09fe · 33d09fe
1 parent dcd51a3
commit 33d09fe
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/check-spelling.yml b/.github/workflows/check-spelling.yml
@@ -14,7 +14,11 @@ jobs:
         with:
           # Files should be consistent with check:spelling files
           files: |
+<<<<<<< HEAD
             content
+=======
+            content/en
+>>>>>>> 57cd4f78 ([CI] Try to get streetsidesoftware/cspell-action to play nice (#4975))
             data
             layouts/**/*.md
           config: .cspell.yml