-
Notifications
You must be signed in to change notification settings - Fork 522
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Yautja Change Holder #4063
Closed
realforest2001
wants to merge
26
commits into
cmss13-devs:master
from
realforest2001:forest/pred/holder3
Closed
Yautja Change Holder #4063
realforest2001
wants to merge
26
commits into
cmss13-devs:master
from
realforest2001:forest/pred/holder3
Conversation
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
realforest2001
added
Whitelist Changes
Test Merge Only
This PR's purpose is for testmerges only.
labels
Jul 31, 2023
This was referenced Aug 2, 2023
3 tasks
3 tasks
This was referenced Sep 21, 2023
3 tasks
Drafting so I stop looking at it |
cm13-github
added
the
Merge Conflict
PR can't be merged because it touched too much code
label
Sep 28, 2023
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
realforest2001
force-pushed
the
forest/pred/holder3
branch
from
September 30, 2023 19:50
fcc6c86
to
eae16e7
Compare
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
PR can't be merged because it touched too much code
label
Sep 30, 2023
Closing as only one active PR for Yautja at the moment. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Sprites
Remove the soul from the game.
Stale Exempt
PR can't go stale
Test Merge Only
This PR's purpose is for testmerges only.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TESTMERGE HOLDER