From b7cdd6a7fd849f57c523dc51ded620aebaf4566d Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 29 Apr 2018 18:48:26 -0400
Subject: [PATCH] Update networks.dm

---
 code/__DEFINES/networks.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/__DEFINES/networks.dm b/code/__DEFINES/networks.dm
index 4d1e626fef..09b9e4cadf 100644
--- a/code/__DEFINES/networks.dm
+++ b/code/__DEFINES/networks.dm
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-#define HID_RESTRICTED_END 101		//the first nonrestricted ID, automatically assigned on connection creation.
-=======
 #define HID_RESTRICTED_END 101		//the first nonrestricted ID, automatically assigned on connection creation.
 
 #define NETWORK_BROADCAST_ID "ALL"
->>>>>>> 19ce08f... More integrated circuits and NTNET upgrade! (#37165)