Skip to content
Check for merge conflicts

WIP Refactor armor.dm and add a new item armor painter to change icon state (skull, paddles etc...) #19718

Sign in to view logs

WIP Refactor armor.dm and add a new item armor painter to change icon state (skull, paddles etc...)

WIP Refactor armor.dm and add a new item armor painter to change icon state (skull, paddles etc...) #19718

Workflow file for this run

.github/workflows/conflicts.yml at 78d5e07
name: 'Check for merge conflicts'
on:
push:
branches:
- master
pull_request_target:
types: [ready_for_review, opened, synchronize, reopened]
jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: eps1lon/[email protected]
with:
dirtyLabel: 'Merge Conflict'
commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
repoToken: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }}