From c94c50e95321a44a6fff59892b916dc594874cce Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 27 May 2022 15:49:17 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../client/preference_setup/loadout/loadout_fluffitems_vr.dm   | 3 ---
 1 file changed, 3 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 8d3817a602..f670b433d3 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
@@ -60,8 +60,6 @@
 	ckeywhitelist = list("aegisoa")
 	character_name = list("Xander Bevin")
 
-<<<<<<< HEAD
-=======
 /datum/gear/fluff/charlotte_medal
     path = /obj/item/clothing/accessory/medal/silver/security
     display_name = "Charlotte's Robust Security Medal"
@@ -98,7 +96,6 @@
 	ckeywhitelist = list("allweek")
 	character_name = list("Fifi The Magnificent")
 
->>>>>>> 0426f96ff8... Merge pull request #12994 from FunnyCatEnjoyer/FunnyCat
 /datum/gear/fluff/lynn_penlight
 	path = /obj/item/device/flashlight/pen/fluff/lynn
 	display_name = "Lynn's Penlight"