Rebase

2022-04-07 03:30:32 -07:00 · 2022-04-07 03:30:32 -07:00 · d1d12d4d0d
parent 29c8072e09
commit d1d12d4d0d
1 changed files with 0 additions and 9 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,19 +1,10 @@
 ---
-<<<<<<< HEAD
 ci:
  skip:
    # pre-commit.ci has trouble with this one
    - update-docs
-    - black
    - end-of-file-fixer
    - 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:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v3.1.0