Update medical.dm

2018-03-26 04:32:36 -05:00
parent 3a93b7e75a
commit 34718e35cd
1 changed files with 0 additions and 6 deletions
@@ -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>")