Update srm_elder.dm

Signed-off-by: MrCat15352 <[email protected]>
CeladonSS13 · Jun 19, 2024 · f388258 · f388258
1 parent fba3f63
commit f388258
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/code/game/MapData/shuttles/srm_elder.dm b/code/game/MapData/shuttles/srm_elder.dm
@@ -23,16 +23,13 @@
 	open_sound = 'sound/machines/wooden_closet_open.ogg'
 	close_sound = 'sound/machines/wooden_closet_close.ogg'
 
-<<<<<<< ours
-=======
 /obj/structure/closet/secure_closet/flamebearer
 	name = "flamebearer's locker"
 	desc = "The closet of equipment an ascetic Flamebearer would require."
 	icon_state = "cabinet"
 	open_sound = 'sound/machines/wooden_closet_open.ogg'
 	close_sound = 'sound/machines/wooden_closet_close.ogg'
 
->>>>>>> theirs
 /obj/structure/closet/secure_closet/hunter
 	name = "hunter's locker"
 	desc = "Everything a hunter will need, held in one secure closet."