jellyfin/jellyfin-expo
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-expo.git synced 2024-11-27 00:00:26 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #566 from jellyfin/renovate/eps1lon-actions-label-merge-conflict-3.x

Browse Source
This commit is contained in:
Bill Thornton 2024-11-13 17:15:15 -05:00 committed by GitHub
commit af9abfeba2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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/automation.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
name: Label merge conflicts
runs-on: ubuntu-latest
steps:
- uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # v2.1.0
- uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
with:
dirtyLabel: 'merge conflict'
repoToken: ${{ secrets.JF_BOT_TOKEN }}