From 282bc176d640111b05a44ea6a45ec9a603618986 Mon Sep 17 00:00:00 2001 From: Pierre Slamich Date: Fri, 10 Nov 2023 15:41:02 +0100 Subject: [PATCH] fix: merge conflicts --- .github/workflows/merge-conflict-autolabel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-conflict-autolabel.yml b/.github/workflows/merge-conflict-autolabel.yml index 93c8c73bec3b3..27ef80adcf3c7 100644 --- a/.github/workflows/merge-conflict-autolabel.yml +++ b/.github/workflows/merge-conflict-autolabel.yml @@ -1,4 +1,4 @@ -name: 'Auto-Label Merge Conflicts on PRs' +name: '💥 Auto-Label Merge Conflicts on PRs' on: push: branches: @@ -14,7 +14,7 @@ jobs: steps: - uses: mschilde/auto-label-merge-conflicts@master with: - CONFLICT_LABEL_NAME: "merge-conflicts" + CONFLICT_LABEL_NAME: "💥 Merge Conflicts" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} MAX_RETRIES: 5 WAIT_MS: 5000