From 5e2b42a19a4606efaa39a1e1b1469197812af628 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 21 Oct 2019 19:53:02 -0400
Subject: [PATCH] Update medical_tools.dm

---
 code/game/mecha/equipment/tools/medical_tools.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 8501c9ef6fd..b8c4534d550 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -573,9 +573,6 @@
 	for(var/reagent in S.processed_reagents)
 		S.reagents.add_reagent(reagent,amount)
 		S.chassis.use_power(energy_drain)
-<<<<<<< HEAD
-	return 1
-=======
 	return 1
 
 /obj/item/mecha_parts/mecha_equipment/crisis_drone