From 543ca3c42c54eec5f27bd902052648ee345b4834 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 4 Apr 2022 17:54:38 -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 33ac34128a..7f0b2614f8 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -331,8 +331,6 @@
 		var/obj/item/clothing/accessory/pridepin_type = pridepin
 		pridepins[initial(pridepin_type.name)] = pridepin_type
 	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pridepins))
-<<<<<<< HEAD
-=======
 
 /datum/gear/accessory/badge
 	display_name = "sheriff badge (Security)"
@@ -351,4 +349,3 @@
 /datum/gear/accessory/pressbadge
 	display_name = "freelance press pass"
 	path = /obj/item/clothing/accessory/badge/press/independent
->>>>>>> 5d24d5b2c3... Merge pull request #12631 from GhostActual/aurora-port-1