fix merge conflict

Signed-off-by: svrnm <[email protected]>
open-telemetry · Aug 7, 2024 · 2990ee9 · 2990ee9
2 parents ef872c9 + 3078352
commit 2990ee9
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/check-spelling.yml b/.github/workflows/check-spelling.yml
@@ -14,15 +14,7 @@ jobs:
         with:
           # Files should be consistent with check:spelling files
           files: |
-<<<<<<< HEAD
-<<<<<<< HEAD
             content
-=======
-            content/en
->>>>>>> 57cd4f78 ([CI] Try to get streetsidesoftware/cspell-action to play nice (#4975))
-=======
-            content
->>>>>>> 65fd0c24 ([CI][i18n] Spell check content/pt, and enable other dicts (#4982))
             data
             layouts/**/*.md
           config: .cspell.yml