Skip to content

Commit b1494c8

Browse files
authored
Merge pull request #4 from Custom-Extension-Works/Xlinka-patch-1
Update conflicts.yml
2 parents f4c3ba7 + 9c985c1 commit b1494c8

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/conflicts.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ jobs:
1010
triage:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: mschilde/auto-label-merge-conflicts@v2.0
13+
- uses: mschilde/auto-label-merge-conflicts@master
1414
with:
1515
CONFLICT_LABEL_NAME: "Has Conflicts"
16-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
MAX_RETRIES: 5
18+
WAIT_MS: 5000

0 commit comments

Comments
 (0)