From e1e4c987237845e390e119e2de4bb2ce1d129156 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 19 Jul 2021 19:41:48 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../loadout/loadout_accessories_vr.dm                 | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
index ed40f96099..67e1f26e82 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
@@ -117,16 +117,7 @@
 Talon pin
 */
 /datum/gear/accessory/talonpin
-<<<<<<< HEAD
-	display_name = "ITV pin"
-	description = "A small enamel pin of the ITV logo."
-	path = /obj/item/clothing/accessory/talon
-||||||| parent of 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix
-	display_name = "ITV pin"
-	description = "A small enamel pin of the ITV logo."
-	path = /obj/item/clothing/accessory/talon
-=======
 	display_name = "Talon pin"
 	description = "A small enamel pin of the Talon logo."
 	path = /obj/item/clothing/accessory/talon
->>>>>>> 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix
+