From 1488b4a16984561fefd88d7b68b22b408985b17f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 May 2026 21:04:55 +0000 Subject: [PATCH] chore(deps): Update eps1lon/actions-label-merge-conflict action to v3.1.0 --- .github/workflows/conflict.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conflict.yml b/.github/workflows/conflict.yml index 7793851c2..de854ab60 100644 --- a/.github/workflows/conflict.yml +++ b/.github/workflows/conflict.yml @@ -17,7 +17,7 @@ jobs: pull-requests: write steps: - name: 🚩 Apply merge conflict label - uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3 + uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0 with: dirtyLabel: '⚔️ merge-conflict' commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'