Update taperecorder.dm

2017-09-12 03:22:47 -05:00
parent fcfd4a2ce1
commit 3ff2263a33
1 changed files with 0 additions and 1 deletions
@@ -7,7 +7,6 @@
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	w_class = WEIGHT_CLASS_SMALL
 	flags_1 = HEAR_1
-<<<<<<< HEAD
 	slot_flags = SLOT_BELT
 	materials = list(MAT_METAL=60, MAT_GLASS=30)
 	force = 2