From 3ff2263a33654e6e4355135f5129c96cf5f2aff5 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 12 Sep 2017 03:22:47 -0500
Subject: [PATCH] Update taperecorder.dm

---
 code/game/objects/items/devices/taperecorder.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 31d1c02f0f..912a083171 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -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