Skip to content

Commit

Permalink
fix: remove check merge conflict from pre-commit (#661)
Browse files Browse the repository at this point in the history
* fix: remove check merge conflict

* fix: remove line for now
  • Loading branch information
d0choa authored Jun 28, 2024
1 parent 08eaaff commit 41cb35b
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 41cb35b

Please sign in to comment.