From e848a3ccf1bcf222dada889921874f67bcee84c1 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 23 May 2021 18:27:13 -0400
Subject: [PATCH] Update walllocker.dm

---
 .../objects/structures/crates_lockers/closets/walllocker.dm    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
index 3728e82d5b2..babaad28a5a 100644
--- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
@@ -9,10 +9,7 @@
 	density = 0
 	anchored = 1
 	store_mobs = 0
-<<<<<<< HEAD
-=======
 	wall_mounted = 1
->>>>>>> 041dc2a... Wall Locker Adjustments (#8093)
 
 //spawns 2 sets of breathmask, emergency oxy tank and crowbar