Auto-update pre-commit hooks (#1147)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> (cherry picked from commit 6255cff) # Conflicts: # .pre-commit-config.yaml
UniversalRobots · Oct 14, 2024 · ea314a6 · ea314a6
1 parent de77824
commit ea314a6
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,13 +33,21 @@ repos:
 
   # Python hooks
   - repo: https://github.com/asottile/pyupgrade
+<<<<<<< HEAD
     rev: v3.9.0
+=======
+    rev: v3.18.0
+>>>>>>> 6255cff (Auto-update pre-commit hooks (#1147))
     hooks:
     -   id: pyupgrade
         args: [--py36-plus]
 
   - repo: https://github.com/psf/black
+<<<<<<< HEAD
     rev: 23.3.0
+=======
+    rev: 24.10.0
+>>>>>>> 6255cff (Auto-update pre-commit hooks (#1147))
     hooks:
       - id: black
         args: ["--line-length=100"]