chore: merge develop with main

artemrys · artemrys · commit ca87e7c7c421 · 2024-05-20T11:25:57.000+02:00
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
