Update subsystems.dm

2018-05-15 09:06:36 -05:00
parent 68fcab96a5
commit 173d4fadae
1 changed files with 0 additions and 4 deletions
@@ -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