From 3886e56c3acdbf5e35eec4434654677bef507c61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 May 2026 08:05:42 +0000 Subject: [PATCH] Bump mschilde/auto-label-merge-conflicts Bumps [mschilde/auto-label-merge-conflicts](https://github.com/mschilde/auto-label-merge-conflicts) from 591722e97f3c4142df3eca156ed0dcf2bcd362bd to 3fdaf1c8b3f8e5b0f88753d9cb3c9c779370b3ef. - [Release notes](https://github.com/mschilde/auto-label-merge-conflicts/releases) - [Commits](https://github.com/mschilde/auto-label-merge-conflicts/compare/591722e97f3c4142df3eca156ed0dcf2bcd362bd...3fdaf1c8b3f8e5b0f88753d9cb3c9c779370b3ef) --- updated-dependencies: - dependency-name: mschilde/auto-label-merge-conflicts dependency-version: 3fdaf1c8b3f8e5b0f88753d9cb3c9c779370b3ef dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/workflows/label_merge_conflicts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml index c1f9849..0f89613 100644 --- a/.github/workflows/label_merge_conflicts.yml +++ b/.github/workflows/label_merge_conflicts.yml @@ -30,7 +30,7 @@ jobs: # https://github.com/marketplace/actions/auto-label-merge-conflicts - id: label-merge-conflict name: Label merge conflict - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # master + uses: mschilde/auto-label-merge-conflicts@3fdaf1c8b3f8e5b0f88753d9cb3c9c779370b3ef # master with: CONFLICT_LABEL_NAME: 💥 Conflicts GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}