Skip to content

Commit 03c94a2

Browse files
authored
Merge pull request matplotlib#28038 from meeseeksmachine/auto-backport-of-pr-28023-on-v3.9.x
Backport PR matplotlib#28023 on branch v3.9.x (ci: Update merge conflict labeler)
2 parents 5dffb5b + a9e5ee3 commit 03c94a2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: .github/workflows/conflictcheck.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check if PRs have merge conflicts
20-
uses: eps1lon/actions-label-merge-conflict@releases/2.x
20+
uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
2121
with:
2222
dirtyLabel: "status: needs rebase"
2323
repoToken: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)