jellyfin/jellyfin-android
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-android.git synced 2025-03-02 19:16:05 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update eps1lon/actions-label-merge-conflict action to v2.1.0

Browse Source
This commit is contained in:
renovate[bot] 2022-10-31 08:51:02 +00:00 committed by Niels van Velzen
parent 31ff5e5359
commit 2debd8f79d
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/repo-merge-conflict.yaml vendored
View File

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-22.04
if: ${{ contains(github.repository_owner, 'jellyfin') }}
steps:
- uses: eps1lon/actions-label-merge-conflict@b8bf8341285ec9a4567d4318ba474fee998a6919 # tag=v2.0.1
- uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # tag=v2.1.0
with:
dirtyLabel: merge conflict
repoToken: ${{ secrets.JF_BOT_TOKEN }}