Moony ab1b37ebbf Add a merge conflict check. (#8626) ...

* Add a merge conflict check.

This is directly copied from https://github.com/wixoaGit/OpenDream/pull/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>

2022-06-04 20:34:48 -07:00

..

ISSUE_TEMPLATE

Update issue template (#8218)

2022-05-16 13:08:27 -07:00

workflows

Add a merge conflict check. (#8626)

2022-06-04 20:34:48 -07:00

CODEOWNERS

Add myself to CODEOWNERS

2022-03-26 15:45:35 +01:00

config.yml

Create config.yml

2020-02-04 20:42:36 +01:00

labeler.yml

Auto-labeling actions for pull requests (#6117)

2022-01-10 16:06:08 -07:00

PULL_REQUEST_TEMPLATE.md

Remove the auto labeler thing from pr template

2021-10-07 18:19:03 -07:00

rsi-schema.json

Adds support for CC-BY-NC licenses (#6648)

2022-02-10 20:27:48 -07:00