Resolve conflicts

b545df1f · Yi Wang · 4c95acfc · b545df1f
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

.pre-commit-config.yaml .pre-commit-config.yaml +1 -0

未找到文件。
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,6 +6,7 @@
 -   repo: https://github.com/pre-commit/pre-commit-hooks
    sha: v0.7.1
    hooks:
+    -   id: check-merge-conflict
    -   id: check-symlinks
    -   id: detect-private-key
    -   id: end-of-file-fixer