Rebase
parent
29c8072e09
commit
d1d12d4d0d
|
@ -1,19 +1,10 @@
|
||||||
---
|
---
|
||||||
<<<<<<< HEAD
|
|
||||||
ci:
|
ci:
|
||||||
skip:
|
skip:
|
||||||
# pre-commit.ci has trouble with this one
|
# pre-commit.ci has trouble with this one
|
||||||
- update-docs
|
- update-docs
|
||||||
- black
|
|
||||||
- end-of-file-fixer
|
- end-of-file-fixer
|
||||||
- trailing-whitespace
|
- trailing-whitespace
|
||||||
||||||| parent of 681ca40 (No update docs)
|
|
||||||
=======
|
|
||||||
ci:
|
|
||||||
skip:
|
|
||||||
# pre-commit.ci has trouble with this one
|
|
||||||
- update-docs
|
|
||||||
>>>>>>> 681ca40 (No update docs)
|
|
||||||
repos:
|
repos:
|
||||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v3.1.0
|
rev: v3.1.0
|
||||||
|
|
Loading…
Reference in New Issue