cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 10:29:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5810 from jellyfin/dependabot/github_actions/eps1lon/actions-label-merge-conflict-v2.0.1

Browse Source 
Bump eps1lon/actions-label-merge-conflict from v2.0.0 to v2.0.1
This commit is contained in:
Bond-009 2021-04-14 22:47:48 +02:00 committed by GitHub
commit 91d6ffd731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/merge-conflicts.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
triage: triage:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: eps1lon/actions-label-merge-conflict@v2.0.0 - uses: eps1lon/actions-label-merge-conflict@v2.0.1
with: with:
dirtyLabel: 'merge conflict' dirtyLabel: 'merge conflict'
repoToken: ${{ secrets.GH_TOKEN }} repoToken: ${{ secrets.GH_TOKEN }}