From 77592de2eccb1f72653b987a756c12afa18ff0e9 Mon Sep 17 00:00:00 2001
From: Tyler Kuhn <contact@tyknet.tk>
Date: Sat, 30 Nov 2019 14:47:18 -0500
Subject: [PATCH] Manually Corrected Merge Issue (#60)

No merge strategy fixed the issue that was introduced in 2c5e51f90f0eda3b46b0d5dd7c9949fa2cf004a5
Manually corrected corrupted files.
---
 GERTe/GEDS/Connection.h | 4 ----
 GERTe/GEDS/Poll.cpp     | 1 -
 GERTe/GEDS/netty.cpp    | 1 -
 GERTe/GEDS/netty.h      | 2 --
 4 files changed, 8 deletions(-)

diff --git a/GERTe/GEDS/Connection.h b/GERTe/GEDS/Connection.h
index a431b75..f328d9b 100644
--- a/GERTe/GEDS/Connection.h
+++ b/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);
diff --git a/GERTe/GEDS/Poll.cpp b/GERTe/GEDS/Poll.cpp
index 8703fc1..9054b96 100644
--- a/GERTe/GEDS/Poll.cpp
+++ b/GERTe/GEDS/Poll.cpp
@@ -60,7 +60,6 @@ void removeTracker(SOCKET fd, Poll* context) {
 		i++;
 	}
 }
-#endif
 
 Poll::Poll() {
 #ifndef _WIN32
diff --git a/GERTe/GEDS/netty.cpp b/GERTe/GEDS/netty.cpp
index 5587769..eef9b62 100644
--- a/GERTe/GEDS/netty.cpp
+++ b/GERTe/GEDS/netty.cpp
@@ -199,7 +199,6 @@ void runServer() { //Listen for new connections
 			close(newSock);
 #endif
 		}
-		catch (int e) {}
 	}
 }
 
diff --git a/GERTe/GEDS/netty.h b/GERTe/GEDS/netty.h
index e5281d8..0bad95c 100644
--- a/GERTe/GEDS/netty.h
+++ b/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();