Even more merging conflicts

Server Application Console/Server Application Console/ChatServer.cs

@@ -66,6 +66,7 @@ namespace Server_Application_Console
             //server control loop
             while (running)
             {
+                Thread.Sleep(0);
                 //checks if a new client is waiting to connect
                 if (currentID == serverID)
                 {
@@ -112,6 +113,7 @@ namespace Server_Application_Console
                 NetworkStream outStream;
                 while (thisClient.Connected && running)
                 {
+                    Thread.Sleep(0);
                     //checks if data is available on the clients stream
                     message = reader.ReadLine();
                     //sends data to all clients in chat

Server Application Console/Server Application Console/MainServer.cs

@@ -30,14 +30,15 @@ namespace Server_Application_Console
             {
                 try
                 {
-                    //possible issues with conflicts if multiple chat servers running, to be fixed later
+                    //possible issues with conflicts if multiple servers running, to be fixed later
                     listener = new TcpListener(IPAddress.Any, port);
                     listener.Start();
+                    listenerStarted = true;
                 }
                 //displays error box if unable to start server
                 catch (SocketException e)
                 {
-                    Console.WriteLine("Unable to start the chat server, the socket is already in use.\n" + e.ToString());
+                    Console.WriteLine("Unable to start the server, the socket is already in use.\n" + e.ToString());
                 }
             }
             //main server control

Server Application Console/Server Application Console/bin/Debug/Server Application Console.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>

Server Application Console/Server Application Console/bin/Debug/Server Application Console.vshost.exe.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>

Server Application Console/Server Application Console/bin/Debug/Server Application Console.vshost.exe.manifest

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>

Server Application Console/Server Application Console/obj/Debug/Server Application Console.csproj.FileListAbsolute.txt

@@ -0,0 +1,6 @@
+C:\Users\Jared\Documents\GitHub\modmore\Server Application Console\Server Application Console\bin\Debug\Server Application Console.exe.config
+C:\Users\Jared\Documents\GitHub\modmore\Server Application Console\Server Application Console\bin\Debug\Server Application Console.exe
+C:\Users\Jared\Documents\GitHub\modmore\Server Application Console\Server Application Console\bin\Debug\Server Application Console.pdb
+C:\Users\Jared\Documents\GitHub\modmore\Server Application Console\Server Application Console\obj\Debug\Server Application Console.csprojResolveAssemblyReference.cache
+C:\Users\Jared\Documents\GitHub\modmore\Server Application Console\Server Application Console\obj\Debug\Server Application Console.exe
+C:\Users\Jared\Documents\GitHub\modmore\Server Application Console\Server Application Console\obj\Debug\Server Application Console.pdb