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

Update eps1lon/actions-label-merge-conflict action to v3
2024-03-29 00:32:34 -04:00
parent dc07b86ce0 05f6be900f
commit cd00e53d73
1 changed files with 1 additions and 1 deletions
--- a/.github/workflows/automation.yml
+++ b/.github/workflows/automation.yml
@@ -14,7 +14,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ github.repository == 'jellyfin/jellyfin-web' }}
    steps:
-      - uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # tag=v2.1.0
+      - uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
        with:
          dirtyLabel: 'merge conflict'
          commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'