|
|
@ -15,7 +15,7 @@ jobs:
|
|
|
|
if: ${{ github.repository == 'jellyfin/jellyfin' }}
|
|
|
|
if: ${{ github.repository == 'jellyfin/jellyfin' }}
|
|
|
|
steps:
|
|
|
|
steps:
|
|
|
|
- name: Apply label
|
|
|
|
- name: Apply label
|
|
|
|
uses: eps1lon/actions-label-merge-conflict@fd1f295ee7443d13745804bc49fe158e240f6c6e # tag=v2.1.0
|
|
|
|
uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
|
|
|
|
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
|
|
|
|
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
|
|
|
|
with:
|
|
|
|
with:
|
|
|
|
dirtyLabel: 'merge conflict'
|
|
|
|
dirtyLabel: 'merge conflict'
|
|
|
|