No update docs

2022-04-06 08:06:27 -07:00 · 2022-04-06 08:06:27 -07:00 · 994792defd
parent 35c0cdde4c
commit 994792defd
1 changed files with 8 additions and 0 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,4 +1,5 @@
 ---
+<<<<<<< HEAD
 ci:
  skip:
    # pre-commit.ci has trouble with this one
@ -6,6 +7,13 @@ ci:
    - 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