etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pre-commit: add hook `check-merge-conflict` (#7883)

This commit is contained in:
John Bampton 2023-10-10 16:33:51 +10:00 committed by GitHub
parent e0ab2a4bd4
commit 7e998f9228
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -31,7 +31,7 @@ repos:
#- id: check-added-large-files #- id: check-added-large-files
- id: check-case-conflict - id: check-case-conflict
#- id: check-executables-have-shebangs #- id: check-executables-have-shebangs
#- id: check-merge-conflict - id: check-merge-conflict
- id: check-vcs-permalinks - id: check-vcs-permalinks
#- id: check-yaml #- id: check-yaml
- id: detect-private-key - id: detect-private-key