From 888a132eff28dbb6934a1590ecc11bc84dab2f8f Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 23 Jan 2018 08:19:16 -0600
Subject: [PATCH] Update expressconsole.dm

---
 code/modules/cargo/expressconsole.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index 13dc742c55..66458c4d36 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -12,12 +12,8 @@
 	var/message
 	var/locked = TRUE
 	var/list/meme_pack_data
-<<<<<<< HEAD
-	
-=======
 	var/podID = 0//0 is your standard supply droppod (requires dissassembly after landing), 1 is the bluespace drop pod (teleports out after landing)
 
->>>>>>> 9ec4f2f... Adds the Bluespace Drop Pod upgrade to the cargo express console (#34560)
 /obj/machinery/computer/cargo/express/Initialize()
 	. = ..()
 	packin_up()