From 173d4fadaea50ecdc9a7022018b021e3af766715 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 15 May 2018 09:06:36 -0500
Subject: [PATCH] Update subsystems.dm

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

diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 6818b567d5..2fb681d1a3 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -1,11 +1,7 @@
 //Update this whenever the db schema changes
 //make sure you add an update to the schema_version stable in the db changelog
 #define DB_MAJOR_VERSION 4
-<<<<<<< HEAD
-#define DB_MINOR_VERSION 1
-=======
 #define DB_MINOR_VERSION 4
->>>>>>> 37854a5... Splits up round table initialize, start, end and shutdown (#37665)
 
 //Timing subsystem
 //Don't run if there is an identical unique timer active