Commit03c94a2

authored

Merge pull request#28038 from meeseeksmachine/auto-backport-of-pr-28023-on-v3.9.x

Backport PR#28023 on branch v3.9.x (ci: Update merge conflict labeler)

2 parents5dffb5b +a9e5ee3 commit03c94a2Copy full SHA for 03c94a2

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ jobs:`
`17`	`17`	`runs-on:ubuntu-latest`
`18`	`18`	`steps:`
`19`	`19`	`-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`
`21`	`21`	`with:`
`22`	`22`	`dirtyLabel:"status: needs rebase"`
`23`	`23`	`repoToken:"${{ secrets.GITHUB_TOKEN }}"`

Comments

(0)