[FIX] .pre-commit-config.yaml conflict

This commit is contained in:
Pedro M. Baeza
2024-05-01 20:39:29 +02:00
parent a8b5cebe6e
commit e1b569071a

View File

@@ -113,11 +113,7 @@ repos:
- id: check-symlinks - id: check-symlinks
- id: check-xml - id: check-xml
- id: mixed-line-ending - id: mixed-line-ending
<<<<<<< before updating
args: ["--fix=lf"] # ruff doesn't support python 3.6
=======
args: ["--fix=lf"] args: ["--fix=lf"]
>>>>>>> after updating
- repo: https://github.com/asottile/pyupgrade - repo: https://github.com/asottile/pyupgrade
rev: v2.29.0 rev: v2.29.0
hooks: hooks: