Revize 3dc0ae76

re 8683 Fix merge errors

Server/ServerApp/Program.cs

@@ -76 +76 @@
 				Console.WriteLine(s);
 			}
 
-            /*
-
-
-
 			// test - connection:
 			//ConnectionListener cl = new ConnectionListener(int.Parse(args[0])/*8000*//*int.Parse(config.Port)*/);
 			//cl.StartListening();
 
-            Console.ReadLine();
-            */
+			Console.ReadLine();
         }