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

Separates DV-added airlocks into DV files #74

Conversation

SimpleStation14
Copy link
Member

Mirror of PR #1002: Separates DV-added airlocks into DV files from DeltaV-Station DeltaV-Station/Delta-v

PR opened by

IamVelcroboy at 2024-03-25 14:52:38 UTC PR merged by

IamVelcroboy at 2024-03-27 16:44:22 UTC

3dea418e7ee0db6136855914dd3f99b01fb337ee


PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:

  • Changes: YML

Original Body

About the PR

Simply moves airlocks we added from the upstream file to our file for better separation/easier management over time. Does not add any new entities.

Why / Balance

Probably should have been done this way the first time but...🤷‍♂️

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Apr 8, 2024
Copy link
Contributor

github-actions bot commented Apr 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added Changes: YML Changes any yml files and removed Status: Merge Conflict FIX YOUR PR AAAGH labels Apr 8, 2024
@Pspritechologist Pspritechologist added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Apr 10, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Apr 14, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Apr 30, 2024
@SimpleStation14 SimpleStation14 marked this pull request as draft May 4, 2024 21:14
Copy link
Contributor

github-actions bot commented May 5, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label May 5, 2024
@VMSolidus VMSolidus marked this pull request as ready for review May 9, 2024 03:29
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label May 9, 2024
@VMSolidus VMSolidus merged commit 7991882 into Simple-Station:master May 9, 2024
10 checks passed
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Sep 9, 2024
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Sep 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: YML Changes any yml files Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants