From 33619893c77b7a411aac027beb00b2ec9c1a354d Mon Sep 17 00:00:00 2001
From: erwincoumans <erwin.coumans@gmail.com>
Date: Mon, 18 Feb 2019 18:34:11 -0800
Subject: [PATCH] fixed failed git merge

---
 examples/SharedMemory/PhysicsServerCommandProcessor.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp
index d48e55d74..9b5f34e14 100644
--- 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);