Skip to content

Commit 68e967b

Browse files
authored
Update .pre-commit-config.yaml
1 parent ac8d70d commit 68e967b

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.pre-commit-config.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ repos:
3333

3434
# Python hooks
3535
- repo: https://github.com/asottile/pyupgrade
36-
<<<<<<< HEAD
37-
rev: v3.19.1
38-
=======
3936
rev: v3.21.0
40-
>>>>>>> a3390ff (Auto-update pre-commit hooks (#1527))
4137
hooks:
4238
- id: pyupgrade
4339
args: [--py36-plus]

0 commit comments

Comments
 (0)