[FIX] Floorbots now actually use the colour of the toolbox they were … #8950
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: 'Merge Conflict Detection' | |
on: | |
push: | |
branches: | |
- master | |
jobs: | |
triage: | |
runs-on: ubuntu-latest | |
steps: | |
- uses: mschilde/auto-label-merge-conflicts@master | |
with: | |
CONFLICT_LABEL_NAME: 'Merge Conflict' | |
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |