From 67b505756fd6d623b9fb8bb28d33e57cfab6fe38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 14:18:42 +0100 Subject: [PATCH] Bump mschilde/auto-label-merge-conflicts from `8c6faa8a` to `591722e9` (#43) * Bump mschilde/auto-label-merge-conflicts Bumps [mschilde/auto-label-merge-conflicts](https://github.com/mschilde/auto-label-merge-conflicts) from 8c6faa8a252e35ba5e15703b3d747bf726cdb95c to 591722e97f3c4142df3eca156ed0dcf2bcd362bd. - [Release notes](https://github.com/mschilde/auto-label-merge-conflicts/releases) - [Commits](https://github.com/mschilde/auto-label-merge-conflicts/compare/8c6faa8a252e35ba5e15703b3d747bf726cdb95c...591722e97f3c4142df3eca156ed0dcf2bcd362bd) --- updated-dependencies: - dependency-name: mschilde/auto-label-merge-conflicts dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Apply suggestions from code review --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- .github/workflows/label-conflicts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label-conflicts.yml b/.github/workflows/label-conflicts.yml index f0ce1cf..a02122d 100644 --- a/.github/workflows/label-conflicts.yml +++ b/.github/workflows/label-conflicts.yml @@ -14,7 +14,7 @@ jobs: triage-conflicts: runs-on: ubuntu-latest steps: - - uses: mschilde/auto-label-merge-conflicts@8c6faa8a252e35ba5e15703b3d747bf726cdb95c # Oct 25, 2021 + - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Jul 20, 2023 with: CONFLICT_LABEL_NAME: "has conflicts" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}