Merge branch 'main' into consolidate

2022-04-07 14:28:46 -07:00 · 2022-04-07 14:28:46 -07:00 · d63d684597
parent 1c4d7faf83 8ef1d0c688
commit d63d684597
2 changed files with 4 additions and 2 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -3,8 +3,6 @@ ci:
  skip:
    # pre-commit.ci has trouble with this one
    - update-docs
-    - end-of-file-fixer
-    - trailing-whitespace
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v3.1.0
--- a/changelogs/fragments/pre-commit-enable.yml
+++ b/changelogs/fragments/pre-commit-enable.yml
@ -0,0 +1,4 @@
+---
+trivial:
+  - Enable pre-commit.ci end-of-file-fixer
+  - Enable pre-commit-ci trailing-whitespace