Corvax drinks added (#1736) #5890
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Check Merge Conflicts | |
| on: | |
| push: | |
| branches: | |
| - master | |
| pull_request_target: | |
| jobs: | |
| Label: | |
| if: github.actor != 'IanComradeBot' | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Check for Merge Conflicts | |
| uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142 | |
| with: | |
| dirtyLabel: "Merge Conflict" | |
| repoToken: "${{ secrets.GITHUB_TOKEN }}" | |
| commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." |