Unit test to make sure all subsystems which initialize call parent

2018-03-20 09:01:46 -04:00
parent 6cd994d342
commit 0832bb62c3
6 changed files with 19 additions and 0 deletions
@@ -4,5 +4,9 @@
 #include "unit_test.dm"
 #include "reagent_recipe_collisions.dm"
 #include "reagent_id_typos.dm"
+<<<<<<< HEAD
 //#include "vore_tests.dm"
+=======
+#include "subsystem_init.dm"
+>>>>>>> 70beb65... Unit test to make sure all subsystems which initialize call parent (#36466)
 #endif