From 55e91dd6a1c67ebae073dbac5027cc19e5a8462f Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 24 Sep 2021 17:16:54 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../loadout/loadout_fluffitems_vr.dm            | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
index d898e6d9ba..f4bb579c43 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
@@ -734,22 +734,6 @@
 	ckeywhitelist = list("pimientopyro")
 	character_name = list("Scylla Casmus")
 
-<<<<<<< HEAD
-||||||| parent of c5f5e58323... Merge pull request #11593 from PastelPrinceDan/fwuff
-/datum/gear/fluff/zaku_sweatervest
-	path = /obj/item/clothing/suit/varsity/green/sweater_vest
-	display_name = "Zaku's Sweater Vest"
-	slot = slot_wear_suit
-	ckeywhitelist = list("pimientopyro")
-	character_name = list("Zaku Fyodorovna")
-
-/datum/gear/fluff/kiyoshi_cloak
-	path = /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing
-	display_name = "glowing cloak"
-	ckeywhitelist = list("pastelprincedan")
-	character_name = list("Kiyoshi Maki", "Masumi Maki")
-
-=======
 /datum/gear/fluff/zaku_sweatervest
 	path = /obj/item/clothing/suit/varsity/green/sweater_vest
 	display_name = "Zaku's Sweater Vest"
@@ -769,7 +753,6 @@
 	ckeywhitelist = list("pastelprincedan")
 	character_name = list("Masumi Maki")
 
->>>>>>> c5f5e58323... Merge pull request #11593 from PastelPrinceDan/fwuff
 //  Q CKEYS
 
 //  R CKEYS