P0 BUGFIX: Master doesn't build because of uncaught git merge conflict. (#39116)

Quick before someone notices

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs
index 61803d7c7d85839c528db4838e819809314cd868..e4732f82f93d6039887c4665dd2fc280e157776c 100644 (file)
--- a/Content.Shared/Bed/Sleep/SleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs
@@ -128,7 +128,7 @@ public sealed partial class SleepingSystem : EntitySystem
         }
 
         _stun.TryUnstun(ent.Owner);
-        _stun.TryStanding(ent.Owner, out _);
+        _stun.TryStanding(ent.Owner);
 
         RemComp<SpamEmitSoundComponent>(ent);
     }