From ce518ee45e78503c91b57e883c4f187035ad079d Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 11 Sep 2017 18:56:10 -0500
Subject: [PATCH] Update closets.dm

---
 code/game/objects/structures/crates_lockers/closets.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 03168d42ea..27cb6de715 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -388,11 +388,7 @@
 
 /obj/structure/closet/AltClick(mob/user)
 	..()
-<<<<<<< HEAD
-	if(!user.canUseTopic(src, be_close=TRUE))
-=======
 	if(!user.canUseTopic(src, be_close=TRUE) || !isturf(loc))
->>>>>>> 847e426... Fixes lockers alt-click (#30544)
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
 	if(opened || !secure)