fixed failed git merge

2019-02-18 18:34:11 -08:00
parent bdf9b10246
commit 33619893c7
1 changed files with 0 additions and 1 deletions
--- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp
+++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp
@@ -7653,7 +7653,6 @@ bool PhysicsServerCommandProcessor::processChangeDynamicsInfoCommand(const struc
 			{
 				mb->setCanSleep(false);
 			}
-			}
 			if (clientCmd.m_changeDynamicsInfoArgs.m_activationState & eActivationStateEnableWakeup)
 			{
 				mb->setCanWakeup(true);