Merge branch 'master' into new_criteria_matching_slides_to_spoken_words #32
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] | |
jobs: | |
find_conflicts: | |
runs-on: ubuntu-20.04 | |
steps: | |
- uses: mschilde/auto-label-merge-conflicts@master | |
with: | |
CONFLICT_LABEL_NAME: "has conflicts" | |
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
MAX_RETRIES: 5 | |
WAIT_MS: 5000 |