From 7150c207aae2afc0e26937af63336b4e76759cb5 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Tue, 19 Jun 2018 07:30:52 -0400
Subject: [PATCH] Fixes a merge conflict

---
 code/modules/clothing/masks/miscellaneous.dm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 2711953d74..667bc7fc78 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -122,13 +122,8 @@
 			message = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish,
 	return message
 
-<<<<<<< HEAD
-obj/item/clothing/mask/frog/cursed
-	flags_1 = NODROP_1 //reee!!
-=======
 /obj/item/clothing/mask/frog/cursed
-	item_flags = NODROP //reee!!
->>>>>>> 6d558b6... puts a / at the start of some obj instances (#38545)
+	flags_1 = NODROP_1 //reee!!
 
 /obj/item/clothing/mask/frog/cursed/attack_self(mob/user)
 	return //no voicebox to alter.