Pi-Hole/docs
1
0
Fork 0
mirror of https://github.com/pi-hole/docs.git synced 2025-12-20 11:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1152 from pi-hole/dependabot/github_actions/master/github_action-dependencies-8e56c5b59f

Browse Source 
Bump eps1lon/actions-label-merge-conflict from 3.0.2 to 3.0.3 in the github_action-dependencies group
This commit is contained in:
yubiuser
2025-01-11 15:02:17 +01:00
committed by GitHub
parent 1cab594361 975e880655
commit 0fa0fbbcca
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check if PRs are have merge conflicts - name: Check if PRs are have merge conflicts
uses: eps1lon/actions-label-merge-conflict@v3.0.2 uses: eps1lon/actions-label-merge-conflict@v3.0.3
with: with:
dirtyLabel: "Merge Conflict" dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}" repoToken: "${{ secrets.GITHUB_TOKEN }}"