From 0f7bde47804e760657c9d8ab55688e0281239b26 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Tue, 24 Aug 2021 20:41:37 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../modules/client/preference_setup/loadout/loadout_suit.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 4fe3fd879e..77194dc819 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -615,15 +615,9 @@
 
 /datum/gear/suit/miscellaneous/cardigan/New()
 	..()
-<<<<<<< HEAD
-	gear_tweaks += gear_tweak_free_color_choice
-||||||| parent of e5bcc628fd... Merge pull request #11469 from PastelPrinceDan/clothingwooyeah
-	gear_tweaks += gear_tweak_free_color_choice
-=======
 	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/suit/cmddressjacket
 	display_name = "command dress jacket"
 	path = /obj/item/clothing/suit/storage/cmddressjacket
 	allowed_roles = list("Facility Director", "Head of Personnel", "Command Secretary")
->>>>>>> e5bcc628fd... Merge pull request #11469 from PastelPrinceDan/clothingwooyeah