fix breaking sf block with not unlocked item duping contents (#3976) #1369
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 Conflicts | |
| on: | |
| push: | |
| branches: | |
| - master | |
| permissions: | |
| contents: read | |
| pull-requests: write | |
| jobs: | |
| validate: | |
| if: github.repository == 'Slimefun/Slimefun4' | |
| name: Check for merge conflicts | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: mschilde/auto-label-merge-conflicts@master | |
| with: | |
| CONFLICT_LABEL_NAME: '⚡ Merge Conflicts' | |
| GITHUB_TOKEN: "${{ secrets.ACCESS_TOKEN }}" |