Fixed merge for some reason.

TCPServer.h

@@ -24,8 +24,7 @@ namespace core
   /// process commands to display status information.
   ///
 
-  class TCPServer : public TCPSocket, public Command
-  {
+  class TCPServer : public TCPSocket, public Command {
 
   public:
     ///
@@ -121,7 +120,7 @@ namespace core
     /// Use the getSessionByAlias to retrieve a session pointer by the value
     /// of the alias pointer.
     ///
-
+     
     TCPSession *getSessionByAlias(void *alias);
 
   protected: