From e8a9e981134f48529b5df29fe6b14d7c42157aa2 Mon Sep 17 00:00:00 2001
From: monster860 <mnmaxim@gmail.com>
Date: Fri, 8 Apr 2016 13:55:32 -0400
Subject: [PATCH] I dun goofed again

---
 code/game/vehicles/spacepods/spacepod.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm
index f02b9caf8d3..8ed498be025 100644
--- a/code/game/vehicles/spacepods/spacepod.dm
+++ b/code/game/vehicles/spacepods/spacepod.dm
@@ -723,11 +723,7 @@
 			else
 				P.close()
 				return 1
-<<<<<<< Updated upstream
-		to_chat(user, "<span class='warning'>Access denied.</span>")
-=======
 		to_chat(usr, "<span class='warning'>Access denied.</span>")
->>>>>>> Stashed changes
 		return
 
 	to_chat(usr, "<span class='warning'>You are not close to any pod doors.</span>")