Adds plantpeople physiologies, buffs alraune in snow and water turfs,… #2653
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 for merge conflicts' | |
on: | |
push: | |
branches: | |
- master | |
- 'project/**' | |
jobs: | |
triage: | |
runs-on: ubuntu-20.04 | |
steps: | |
- uses: mschilde/auto-label-merge-conflicts@2e8fcc76c6430272ec8bb64fb74ec1592156aa6a | |
with: | |
CONFLICT_LABEL_NAME: 'Merge Conflict' | |
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
# Default attempt count is 5, so default attempt delay is 5 * 10 = 50 seconds. | |
WAIT_MS: 10000 |