|
|
|
@ -14,7 +14,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@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'}}
|
|
|
|
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
|
|
|
|
with:
|
|
|
|
with:
|
|
|
|
dirtyLabel: 'merge conflict'
|
|
|
|
dirtyLabel: 'merge conflict'
|
|
|
|
|
Bond-009
2 years ago
committed by
GitHub