From 167891b7e2b8b930b352dd50b5278cbd3687ecfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 21:06:13 +0000 Subject: [PATCH] :arrow_up: Bump olivernybroe/action-conflict-finder from 4.0 to 4.1 Bumps [olivernybroe/action-conflict-finder](https://github.com/olivernybroe/action-conflict-finder) from 4.0 to 4.1. - [Release notes](https://github.com/olivernybroe/action-conflict-finder/releases) - [Commits](https://github.com/olivernybroe/action-conflict-finder/compare/v4.0...v4.1) --- updated-dependencies: - dependency-name: olivernybroe/action-conflict-finder dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/git_checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/git_checks.yml b/.github/workflows/git_checks.yml index 9fb9291..4e91c56 100644 --- a/.github/workflows/git_checks.yml +++ b/.github/workflows/git_checks.yml @@ -21,4 +21,4 @@ jobs: - uses: actions/checkout@v4 # Run the actual merge conflict finder - name: Merge Conflict finder - uses: olivernybroe/action-conflict-finder@v4.0 + uses: olivernybroe/action-conflict-finder@v4.1