Skip to content
Check for merge conflicts

Readds old MP uniform, armor and headgear. Adds MP lore descriptions. Tweaks MP locker loadouts. #11476

Sign in to view logs

Readds old MP uniform, armor and headgear. Adds MP lore descriptions. Tweaks MP locker loadouts.

Readds old MP uniform, armor and headgear. Adds MP lore descriptions. Tweaks MP locker loadouts. #11476

Workflow file for this run

.github/workflows/conflicts.yml at 86e716f
name: 'Check for merge conflicts'
on:
push:
branches:
- master
pull_request_target:
types: [ready_for_review, opened, synchronize, reopened]
jobs:
triage:
runs-on: ubuntu-20.04
steps:
- uses: eps1lon/[email protected]
with:
dirtyLabel: 'Merge Conflict'
repoToken: ${{ secrets.BOT_TOKEN_CM || secrets.GITHUB_TOKEN }}