From 62f139f217eb8cc37158959493f085b71983d1f1 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 15 Feb 2018 20:30:47 -0500 Subject: [PATCH] Update _unit_tests.dm --- code/modules/unit_tests/_unit_tests.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 522e34a10b..47d35108a1 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -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)