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

Re-Merge of engineering lobby #20143

Merged

Conversation

FabianK3
Copy link
Contributor

@FabianK3 FabianK3 commented Nov 7, 2024

This PR re-adds the engineering lobby of #19996 that has been overridden with the merge of the BSD #20053.
Previous source branch has been restored.

Appendum:

  • I'm considering the PR ready when the mapdiffbot shows no changes outside the original engineering lobby and all checks are green, as the original PR already got reviewed/merged.
  • Marking it as bugfix for obvious reasons/transparency.

@github-actions github-actions bot added the 🗺️ Mapping - Horizon The PR touches the Horizon map files. label Nov 7, 2024
@FabianK3
Copy link
Contributor Author

FabianK3 commented Nov 7, 2024

!bugfix

@BotBOREALIS BotBOREALIS added the Bugfix The PR is fixing an issue and requires less reviews and time to be ready for merging. label Nov 7, 2024
@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Nov 7, 2024
Merged via the queue into Aurorastation:master with commit 6a0531a Nov 7, 2024
25 checks passed
@FabianK3 FabianK3 deleted the engineering-lobby-revision branch November 7, 2024 18:43
github-merge-queue bot pushed a commit that referenced this pull request Nov 8, 2024
### Introduction
With the re-merge (#20143) of the engineering lobby the piping aft of
the lobby broke due to merge-conflicts.

### What changed?
- Fixed the piping.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bugfix The PR is fixing an issue and requires less reviews and time to be ready for merging. 🗺️ Mapping - Horizon The PR touches the Horizon map files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants