From f55ad5ec95a450e9b30669975c0cff9e8fbb2bbc Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 12 Sep 2017 23:12:19 -0500
Subject: [PATCH] Update safe.dm

---
 code/game/objects/structures/safe.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 625a5713ba..bbea363919 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -14,7 +14,6 @@ FLOOR SAFES
 	density = TRUE
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	var/open = FALSE		//is the safe open?
-<<<<<<< HEAD
 	var/tumbler_1_pos	//the tumbler position- from 0 to 72
 	var/tumbler_1_open	//the tumbler position to open at- 0 to 72
 	var/tumbler_2_pos