chore: merge develop with main

splunk · May 20, 2024 · ca87e7c · ca87e7c
2 parents 92342e0 + 546f34a
commit ca87e7c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,4 +1,8 @@
 repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+    - id: check-merge-conflict
 -   repo: local
     hooks:
       - id: actionlint