From 8f2f4751f0f03e60902b4eac30611c67c39ed53f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Nov 2022 07:38:01 +0000 Subject: [PATCH] build(deps): bump eps1lon/actions-label-merge-conflict Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 2.0.1 to 2.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/v2.0.1...v2.1.0) --- updated-dependencies: - dependency-name: eps1lon/actions-label-merge-conflict dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-check-conflicts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-check-conflicts.yml b/.github/workflows/pr-check-conflicts.yml index ebc9be0cd..18d3373eb 100644 --- a/.github/workflows/pr-check-conflicts.yml +++ b/.github/workflows/pr-check-conflicts.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: # Docs: https://github.com/marketplace/actions/label-conflicting-pull-requests - - uses: eps1lon/actions-label-merge-conflict@v2.0.1 + - uses: eps1lon/actions-label-merge-conflict@v2.1.0 with: dirtyLabel: merge-conflict repoToken: ${{ secrets.GITHUB_TOKEN }}