Ninjalama/streamyfin
1
0
Fork 0
forked from Ninjalama/streamyfin_mirror
Code Pull Requests 2 Actions Packages Projects Releases Activity

fix: rename merge conflict label (#725)

Browse Source
This commit is contained in:
Gauvain
2025-06-02 13:52:12 +02:00
committed by GitHub
parent 1b812ebed5
commit d3660b45b1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/conflict.yml vendored
View File

@@ -19,6 +19,6 @@ jobs:
- name: 🚩 Apply merge conflict label
uses: eps1lon/actions-label-merge-conflict@v3.0.3
with:
dirtyLabel: 'merge conflict'
dirtyLabel: 'merge-conflict'
commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
repoToken: '${{ secrets.GITHUB_TOKEN }}'