Update .pre-commit-config.yaml

ros-controls · Mar 26, 2024 · e01f79f · e01f79f
1 parent 9d93c42
commit e01f79f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -62,11 +62,7 @@ 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']