From 34718e35cd8cb97bc6adce93267771294e892ba9 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawa@users.noreply.github.com>
Date: Mon, 26 Mar 2018 04:32:36 -0500
Subject: [PATCH] Update medical.dm

---
 code/game/machinery/computer/medical.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 11138a8ee2..cead905ec4 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -34,14 +34,8 @@
 	else
 		return ..()
 
-<<<<<<< HEAD
-/obj/machinery/computer/med_data/attack_hand(mob/user)
-	if(..())
-		return
-=======
 /obj/machinery/computer/med_data/ui_interact(mob/user)
 	. = ..()
->>>>>>> a27f102... Merge pull request #36695 from kevinz000/fix_9
 	var/dat
 	if(temp)
 		dat = text("<TT>[temp]</TT><BR><BR><A href='?src=[REF(src)];temp=1'>Clear Screen</A>")