Bump version of pre-commit hooks (#1456)

(cherry picked from commit 99d7128) # Conflicts: # .pre-commit-config.yaml
ros-controls · Mar 26, 2024 · 9d93c42 · 9d93c42
1 parent deb34de
commit 9d93c42
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -62,7 +62,11 @@ repos:
 
   # CPP hooks
   - repo: https://github.com/pre-commit/mirrors-clang-format
+<<<<<<< HEAD
     rev: v18.1.0
+=======
+    rev: v18.1.2
+>>>>>>> 99d7128 (Bump version of pre-commit hooks (#1456))
     hooks:
       - id: clang-format
         args: ['-fallback-style=none', '-i']