Update safe.dm

2017-09-12 23:12:19 -05:00
parent 3ff2263a33
commit f55ad5ec95
1 changed files with 0 additions and 1 deletions
@@ -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