From 24657017f49a5f4000dc0f7995d69e2d5d0eadca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 May 2026 21:04:18 +0000 Subject: [PATCH] chore(deps): bump eps1lon/actions-label-merge-conflict Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.3 to 3.1.0. - [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases) - [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md) - [Commits](https://github.com/eps1lon/actions-label-merge-conflict/compare/1df065ebe6e3310545d4f4c4e862e43bdca146f0...0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1) --- updated-dependencies: - dependency-name: eps1lon/actions-label-merge-conflict dependency-version: 3.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml index a05b477..4cec4f7 100644 --- a/.github/workflows/merge-conflict.yml +++ b/.github/workflows/merge-conflict.yml @@ -21,7 +21,7 @@ jobs: name: Flag PRs with merge conflict runs-on: ubuntu-latest steps: - - uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3 + - uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3 with: dirtyLabel: "needs-rebase" repoToken: ${{ github.token }}