Hotfix #30291 #30932
Merged
Hotfix #30291 #30932
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
github-actions
bot
added
Changes: No C#
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 19ca77c merging into 463a529 Resources/Textures/Clothing/Head/Helmets/security.rsi
|
This reverts commit 2b4ae87.
github-actions
bot
removed
the
S: Merge Conflict
formlessnameless
pushed a commit
to formlessnameless/imp-station-14
that referenced
this pull request
Aug 14, 2024
* add * Revert "add" This reverts commit 2b4ae87. * add
Erisfiregamer1
added a commit
to The-Arcadis-Team/arc-station-14
that referenced
this pull request
Sep 11, 2024
This reverts commit d220249. Almost there.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About the PR
I'm still new to being a maintainer and accidentally merged the PR prematurely, so I made a followup PR fixing the issues.