Update _unit_tests.dm

2018-02-15 20:30:47 -05:00
parent 5005fb20c6
commit 62f139f217
1 changed files with 0 additions and 8 deletions
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-//include unit test files in this module in this ifdef
-
-#ifdef UNIT_TESTS
-#include "unit_test.dm"
-#endif
-=======
 //include unit test files in this module in this ifdef

 #ifdef UNIT_TESTS
@@ -12,4 +5,3 @@
 #include "reagent_recipe_collisions.dm"
 #include "reagent_id_typos.dm"
 #endif
->>>>>>> ad7fc74... Added chemical reaction unit tests (#35478)