Simple-Station / Einstein-Engines

A Space Station 14 upstream repository, inspired by Baystation12.
https://einstein.simplestation.org
GNU Affero General Public License v3.0
27 stars 53 forks source link

Failed to cherry-pick PR #26388: Update submodule to 215.2.0 #359

Closed SimpleStation14 closed 1 month ago

SimpleStation14 commented 2 months ago

Failed to cherry-pick PR: cannot create a tree from a not fully merged index.; class=Index (10); code=Unmerged (-10)

PR body below

Mirror of PR #26388: Update submodule to 215.2.0 from space-wizards space-wizards/space-station-14

3731cc3c50e544345121ea4e7a15f48a3154b10d

PR opened by metalgearsloth at 2024-03-24 13:59:29 UTC


PR changed files with additions and deletions.

The PR had the following labels:


Original Body

> weh
DEATHB4DEFEAT commented 1 month ago

https://github.com/Simple-Station/Einstein-Engines/pull/394