Ice Classic December 2024 Testmerge #7598
Conversation
…ce_classic_update_attempt
…ce_classic_update_attempt
…ease replace them with pre-defined objects.
… ice_classic_update_attempt
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
… ice_classic_update_attempt
…eGaming1/cmss13 into ice_classic_update_attempt
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
added
the
Merge Conflict
something something december testmerge only
Putting up now to test checks and hopefully get reviewed to make sure i didnt break something too much