Update _unit_tests.dm

2018-03-20 11:11:41 -04:00
parent 0832bb62c3
commit 3a5fbcf15e
1 changed files with 0 additions and 3 deletions
@@ -4,9 +4,6 @@
 #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