pi-hole/docs
1
0
Fork 0
mirror of https://github.com/pi-hole/docs.git synced 2024-12-06 19:27:12 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #825 from pi-hole/be_honest

Browse Source 
Shorten no merge conflict message
This commit is contained in:
DL6ER
2022-12-23 12:18:42 +01:00
committed by GitHub
parent 049210224f 3e921213a5
commit 0b92780092
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/merge-conflict.yml
+1 -1
View File
@@ -18,4 +18,4 @@ jobs:
dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
commentOnClean: "Conflicts have been resolved."