From 96191b8b6a122feaf28f74480d61677fb998c025 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Tue, 10 Apr 2018 03:15:27 -0400
Subject: [PATCH] Update emergency.dm

---
 code/modules/shuttle/emergency.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index fe8edc1d6b..daa1b96f6d 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -426,10 +426,6 @@
 
 /obj/docking_port/mobile/pod/Initialize()
 	. = ..()
-<<<<<<< HEAD
-	if(id == "pod")
-		WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.")
-=======
 	var/static/i = 1
 	if(id == initial(id))
 		id = "[initial(id)][i]"
@@ -447,7 +443,6 @@
 	i++
 
 
->>>>>>> c85c195... Fixes escape pods not getting to their default destination (#37065)
 
 /obj/docking_port/mobile/pod/cancel()
 	return