From 9ba658369062988377383452c0cb7f7e8737b8b7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 7 Apr 2024 20:08:05 +0200 Subject: [PATCH 1/2] Bump version of pre-commit hooks (#64) (cherry picked from commit c8e4791026c65aa5c2141e206c97cdf1a915ec54) # Conflicts: # .pre-commit-config.yaml --- .pre-commit-config.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bb47ab4..a45f443 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: # Standard hooks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: check-added-large-files - id: check-ast @@ -62,7 +62,11 @@ repos: # CPP hooks - repo: https://github.com/pre-commit/mirrors-clang-format +<<<<<<< HEAD rev: v18.1.1 +======= + rev: v18.1.3 +>>>>>>> c8e4791 (Bump version of pre-commit hooks (#64)) hooks: - id: clang-format args: ['-fallback-style=none', '-i'] @@ -131,7 +135,7 @@ repos: exclude: CHANGELOG\.rst|\.(svg|pyc)$ - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.0 + rev: 0.28.1 hooks: - id: check-github-workflows args: ["--verbose"] From d56af9e0362059a2f7e368a010d69afee7766c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Sun, 7 Apr 2024 20:19:11 +0200 Subject: [PATCH 2/2] Fix merge conflicts --- .pre-commit-config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a45f443..a8c269f 100755 --- 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.1 -======= rev: v18.1.3 ->>>>>>> c8e4791 (Bump version of pre-commit hooks (#64)) hooks: - id: clang-format args: ['-fallback-style=none', '-i']