summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <stephen@that.guru>2022-06-16 19:05:34 +0100
committerStephen Finucane <stephen@that.guru>2022-06-16 19:05:34 +0100
commitb973f709e7a184c49f107a498a72f060eddd7375 (patch)
treec79d18f42a81ccf0d10ac59bfb616b86dbf25b6d
parente626ee3f19a1950ce3111cbaecba0bf7ef9a38f4 (diff)
downloadwarlock-b973f709e7a184c49f107a498a72f060eddd7375.tar.gz
pre-commit: Remove no-commit-to-branch
This is unnecessary Signed-off-by: Stephen Finucane <stephen@that.guru>
-rw-r--r--.pre-commit-config.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 22c0862..51ca187 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -18,7 +18,6 @@ repos:
args: ["--django"] # Required to match on test*.py
# Git-related
- - id: no-commit-to-branch
- id: check-merge-conflict
- repo: https://gitlab.com/pycqa/flake8