diff options
| author | Bond-009 <bond.009@outlook.com> | 2026-05-28 19:19:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-28 19:19:23 +0200 |
| commit | ef9468e85774d4d3847476565796343100ea36f5 (patch) | |
| tree | ea653f9fb15cfa3ca92e90075b4cd73211b91d4e /.github/workflows/pull-request-conflict.yml | |
| parent | 2f17516d4bd8700e4a66f609b9c5fac835020407 (diff) | |
| parent | fa3a33c04ead82a4eb0e1542369f1f87fa2a63da (diff) | |
Merge pull request #16949 from jellyfin/renovate/ci-deps
Update CI dependencies
Diffstat (limited to '.github/workflows/pull-request-conflict.yml')
| -rw-r--r-- | .github/workflows/pull-request-conflict.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/pull-request-conflict.yml b/.github/workflows/pull-request-conflict.yml index 32628ac912..7684743bef 100644 --- a/.github/workflows/pull-request-conflict.yml +++ b/.github/workflows/pull-request-conflict.yml @@ -15,7 +15,7 @@ jobs: if: ${{ github.repository == 'jellyfin/jellyfin' && github.event.issue.pull_request }} steps: - name: Apply label - uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3 + uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0 if: ${{ github.event_name == 'push' || github.event_name == 'pull_request'}} with: dirtyLabel: 'merge conflict' |