Splits up round table initialize, start, end and shutdown

2018-05-15 02:12:50 -05:00
parent 19306a2d9b
commit 68fcab96a5
7 changed files with 82 additions and 10 deletions
@@ -1,7 +1,11 @@
 //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