summaryrefslogtreecommitdiff
path: root/.pre-commit-config.yaml
diff options
context:
space:
mode:
Diffstat (limited to '.pre-commit-config.yaml')
-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