From aa8331032a6cd5bb2e4ec6c8e5dc4fe84d66a350 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jun 2026 06:15:48 +0000
Subject: [PATCH] chore(deps): update eps1lon/actions-label-merge-conflict
 action from v3.0.3 to v3.1.0 (.github/workflows/detect-merge-conflicts.yaml)

---
 .github/workflows/detect-merge-conflicts.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/detect-merge-conflicts.yaml b/.github/workflows/detect-merge-conflicts.yaml
index 3b8a791d4a6..c5c07df38e3 100644
--- a/.github/workflows/detect-merge-conflicts.yaml
+++ b/.github/workflows/detect-merge-conflicts.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: check if prs are conflicted
         # we experience a high error rate so we allow this to fail but still have the check become green on the PR
         continue-on-error: true
-        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+        uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
         with:
           dirtyLabel: "conflicts-detected"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"