Bump version of pre-commit hooks (#70)

Co-authored-by: christophfroehlich <[email protected]> (cherry picked from commit 18e109b) # Conflicts: # .pre-commit-config.yaml
ros-controls · May 1, 2024 · c98050e · c98050e
1 parent 36d2fd9
commit c98050e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -49,7 +49,7 @@ repos:
       args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404"]
 
   - repo: https://github.com/psf/black
-    rev: 24.4.0
+    rev: 24.4.2
     hooks:
       - id: black
         args: ["--line-length=99"]
@@ -62,7 +62,11 @@ repos:
 
   # CPP hooks
   - repo: https://github.com/pre-commit/mirrors-clang-format
+<<<<<<< HEAD
     rev: v18.1.1
+=======
+    rev: v18.1.4
+>>>>>>> 18e109b (Bump version of pre-commit hooks (#70))
     hooks:
       - id: clang-format
         args: ['-fallback-style=none', '-i']