diff options
| author | Bond-009 <bond.009@outlook.com> | 2022-11-05 12:01:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 12:01:25 +0100 |
| commit | d929793251afbf0692b0f7bb5dcc8fd247fc3f9b (patch) | |
| tree | b28170ddf39a95f4ae8ae7290df960f2d0f344dc | |
| parent | f738e7c051d92ade9c6226b144089903aaf7a1a4 (diff) | |
| parent | a01b0960d3e7f840043d6ca152b1ec4645105ace (diff) | |
Merge pull request #8685 from jellyfin/renovate/ci-deps
| -rw-r--r-- | .github/workflows/automation.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index 01cd41a08..0989df64b 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -14,7 +14,7 @@ jobs: if: ${{ github.repository == 'jellyfin/jellyfin' }} steps: - name: Apply label - uses: eps1lon/actions-label-merge-conflict@b8bf8341285ec9a4567d4318ba474fee998a6919 # tag=v2.0.1 + uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # tag=v2.1.0 if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}} with: dirtyLabel: 'merge conflict' |