Skip to content

Commit 06677d1

Browse files

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
# exclude: ^(docs/_static/ac-website/robot-loop.mp4|docs/courses/robotics/ac-website/robot-loop.gif)$
1111
- id: check-ast
1212
- id: check-json
13-
- id: check-merge-conflict
13+
# - id: check-merge-conflict
1414
- id: check-xml
1515
- id: check-yaml
1616
- id: debug-statements

0 commit comments

Comments
 (0)