Manually Corrected Merge Issue (#60)

No merge strategy fixed the issue that was introduced in 2c5e51f
Manually corrected corrupted files.

GERTe/GEDS/Connection.h

@@ -8,10 +8,6 @@ static unsigned long nonZero = 1;
 typedef int SOCKET;
 #endif
 
-#ifdef _WIN32
-static unsigned long nonZero = 1;
-#endif
-
 class Connection {
 protected:
 	Connection(SOCKET, std::string);

GERTe/GEDS/Poll.cpp

@@ -60,7 +60,6 @@ void removeTracker(SOCKET fd, Poll* context) {
 		i++;
 	}
 }
-#endif
 
 Poll::Poll() {
 #ifndef _WIN32

GERTe/GEDS/netty.cpp

@@ -199,7 +199,6 @@ void runServer() { //Listen for new connections
 			close(newSock);
 #endif
 		}
-		catch (int e) {}
 	}
 }
 

GERTe/GEDS/netty.h

@@ -9,8 +9,6 @@ typedef unsigned short USHORT;
 typedef unsigned long long SOCKET;
 #else
 typedef int SOCKET;
-#else
-typedef unsigned long long SOCKET;
 #endif
 
 void runServer();