From 3a5fbcf15e48c16285006ed42b2e016d168604e0 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Tue, 20 Mar 2018 11:11:41 -0400
Subject: [PATCH] Update _unit_tests.dm

---
 code/modules/unit_tests/_unit_tests.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index df1d6d6457..59cf27bbf3 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -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