From 64690a85404391dcf76bea7ea4be438512a3636d Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 23 May 2019 13:29:49 -0400
Subject: [PATCH] Update medical.dm

---
 code/game/machinery/computer/medical.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 048cb85b9be..da86e4ee3cf 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -553,8 +553,5 @@
 	icon_state = "laptop"
 	icon_keyboard = "laptop_key"
 	icon_screen = "medlaptop"
-<<<<<<< HEAD
-=======
 	circuit = /obj/item/weapon/circuitboard/med_data/laptop
->>>>>>> 209cb36... Big Bugfix Bonanza (#6170)
-	density = 0
\ No newline at end of file
+	density = 0