mirror of
https://github.com/OCA/intrastat-extrastat.git
synced 2025-02-16 17:13:41 +02:00
[FIX] .pre-commit-config.yaml conflict
This commit is contained in:
@@ -113,11 +113,7 @@ repos:
|
||||
- id: check-symlinks
|
||||
- id: check-xml
|
||||
- id: mixed-line-ending
|
||||
<<<<<<< before updating
|
||||
args: ["--fix=lf"] # ruff doesn't support python 3.6
|
||||
=======
|
||||
args: ["--fix=lf"]
|
||||
>>>>>>> after updating
|
||||
- repo: https://github.com/asottile/pyupgrade
|
||||
rev: v2.29.0
|
||||
hooks:
|
||||
|
||||
Reference in New Issue
Block a user