Revert "Remove merge conflict comment" (#8820)

This commit is contained in:
ike709
2022-06-13 11:45:23 -05:00
committed by GitHub
parent a39233c6ff
commit 1af683ee90

View File

@@ -15,3 +15,4 @@ jobs:
with:
dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."