Skip to content

Commit

Permalink
fix: merge conflicts (#9286)
Browse files Browse the repository at this point in the history
  • Loading branch information
teolemon committed Nov 10, 2023
1 parent 1e93786 commit 9c4b9af
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/merge-conflict-autolabel.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Auto-Label Merge Conflicts on PRs'
name: '馃挜 Auto-Label Merge Conflicts on PRs'
on:
push:
branches:
Expand All @@ -14,7 +14,7 @@ jobs:
steps:
- uses: mschilde/auto-label-merge-conflicts@master
with:
CONFLICT_LABEL_NAME: "merge-conflicts"
CONFLICT_LABEL_NAME: "馃挜 Merge Conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_RETRIES: 5
WAIT_MS: 5000

0 comments on commit 9c4b9af

Please sign in to comment.