From 41cb35bdb56084c8bb52c5dec458c14f59cc1ffa Mon Sep 17 00:00:00 2001 From: David Ochoa Date: Fri, 28 Jun 2024 12:52:01 +0100 Subject: [PATCH] fix: remove check merge conflict from pre-commit (#661) * fix: remove check merge conflict * fix: remove line for now --- .pre-commit-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 00d914dc0..d6e452c65 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,7 +21,6 @@ repos: - id: end-of-file-fixer exclude: "CHANGELOG.md" - id: debug-statements - - id: check-merge-conflict - id: check-case-conflict - id: check-json exclude: (.vscode|.devcontainer)