Merge pull request #316 from JohnStrunk/pc-merge-confiict

Add check for merge conflict markers
JohnStrunk · Aug 11, 2023 · 4a12c84 · 4a12c84
2 parents 35f37cb + afcefd8
commit 4a12c84
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -17,6 +17,7 @@ repos:
                 media/cc-receiver-logo\.svg|
                 testdata/.*
             )$
+      - id: check-merge-conflict     # Check for files that contain merge conflict strings
       - id: check-yaml               # Checks yaml files for parseable syntax
       - id: end-of-file-fixer        # Ensures that a file is either empty, or ends with one newline
         exclude: |