This repository was archived by the owner on Aug 6, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a merge conflict check. (space-wizards#8626)
* Add a merge conflict check. This is directly copied from OpenDreamProject/OpenDream#648 * Update .github/workflows/conflict-labeler.yml Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com>
- Loading branch information