From 55d019c4e28067d5a06c255d1fe2a0f0dc30e521 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:41:24 +0000 Subject: [PATCH] Bump eps1lon/actions-label-merge-conflict from 3.0.2 to 3.0.3 Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.2 to 3.0.3. - [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/v3.0.2...v3.0.3) --- updated-dependencies: - dependency-name: eps1lon/actions-label-merge-conflict dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/conflicts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conflicts.yaml b/.github/workflows/conflicts.yaml index 9dee112f7f6e..14d665af390a 100644 --- a/.github/workflows/conflicts.yaml +++ b/.github/workflows/conflicts.yaml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check for merge conflicts - uses: eps1lon/actions-label-merge-conflict@v3.0.2 + uses: eps1lon/actions-label-merge-conflict@v3.0.3 with: repoToken: ${{ secrets.GITHUB_TOKEN }} dirtyLabel: merge-conflict