Merge pull request #18 from joshuachp/chore-update

Chore update
joshuachp · Jul 3, 2023 · ddabcae · ddabcae
2 parents 1e49e2e + adee216
commit ddabcae
Show file tree

Hide file tree

Showing 4 changed files with 221 additions and 139 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,6 +8,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
+      - id: check-merge-conflict
   - repo: https://github.com/joshuachp/pre-commit-hooks
     rev: 0.1.24
     hooks: