Skip to content
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

[MIRROR] removes double parent call from my last pr #2051

Merged
merged 2 commits into from
Feb 20, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1016
Original PR: tgstation/tgstation#81515

About The Pull Request

i accidently put two parent calls in #81472

🆑 kawaiinick
code: changed some code
/:cl:

[NO GBP]removes double parent call from my last pr

Co-authored-by: kawaiinick <[email protected]>
Co-authored-by: Bloop <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror labels Feb 18, 2024
@Iajret Iajret merged commit 92e4282 into master Feb 20, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-1016 branch February 20, 2024 09:24
Iajret pushed a commit that referenced this pull request Apr 18, 2024
ReezeBL pushed a commit that referenced this pull request Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants