Skip to content

Commit 834edeb

Browse files
committed
Fix conflict detection
Bump the action version to a commit that addresses the root cause Signed-off-by: David Thompson <davthomp@redhat.com>
1 parent 1bf3877 commit 834edeb

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.github/workflows/conflictDetector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
triage:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: mschilde/auto-label-merge-conflicts@8c6faa8a252e35ba5e15703b3d747bf726cdb95c
9+
- uses: mschilde/auto-label-merge-conflicts@cd484bbf0476fbe79474a937681a253e094cac3d
1010
with:
1111
CONFLICT_LABEL_NAME: "has conflicts"
1212
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)