From ba62732d257faea2a3cebdc3d21e0ed0af8abef8 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 21 Mar 2022 14:16:11 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../client/preference_setup/loadout/loadout_accessories.dm     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
index dfeca3b793..5a8728cf5b 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -307,8 +307,6 @@
 	"Grey Vest" = /obj/item/clothing/accessory/cowboy_vest/grey
 	)
 	gear_tweaks += new/datum/gear_tweak/path(cowboy_vests)
-<<<<<<< HEAD
-=======
 
 /datum/gear/accessory/pride
 	display_name = "pride pin selection"
@@ -321,4 +319,3 @@
 		var/obj/item/clothing/accessory/pridepin_type = pridepin
 		pridepins[initial(pridepin_type.name)] = pridepin_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pridepins))
->>>>>>> e1f20bae13... Merge pull request #12500 from GhostActual/pride_pins