From 5222f4f1b10d1a5019a90e4ed45a9b9918aed673 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 27 Mar 2021 23:22:55 -0400
Subject: [PATCH] Update loadout_fluffitems_vr.dm

---
 .../preference_setup/loadout/loadout_fluffitems_vr.dm  | 10 ----------
 1 file changed, 10 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 a073f25b00..b753cfdec6 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
@@ -1046,22 +1046,12 @@
 	ckeywhitelist = list("vitoras")
 	character_name = list("Roanna Ti'Rox")
 
-<<<<<<< HEAD
-||||||| parent of a39a93b1b4... Merge pull request #10007 from Heroman3003/idfix3
-/datum/gear/fluff/harmony_id
-	path = /obj/item/weapon/card/id/fluff/harmony
-	display_name = "Harmony's ITG-ID card"
-	ckeywhitelist = list("verysoft")
-	character_name = list("Harmony")
-
-=======
 /datum/gear/fluff/harmony_id
 	path = /obj/item/weapon/card/id/event/fluff/harmony
 	display_name = "Harmony's ITG-ID card"
 	ckeywhitelist = list("verysoft")
 	character_name = list("Harmony")
 
->>>>>>> a39a93b1b4... Merge pull request #10007 from Heroman3003/idfix3
 //  W CKEYS
 /datum/gear/fluff/sthasha_bracer
 	path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha