From b3ccdb22a9276a9d8b2a2f890e2152c3be6a2398 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 19 Jun 2021 21:00:46 -0400
Subject: [PATCH] powder that makes you say yes

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

diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index b40e27294e..2de9713198 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -72,11 +72,6 @@
 
 /datum/gear/suit/oversize/New()
 	..()
-<<<<<<< HEAD
-	gear_tweaks += gear_tweak_free_color_choice
-||||||| parent of 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
-	gear_tweaks += gear_tweak_free_color_choice
-=======
 	gear_tweaks += gear_tweak_free_color_choice
 
 /*
@@ -85,4 +80,3 @@ Talon winter coat
 /datum/gear/suit/wintercoat/talon
 	display_name = "winter coat, ITV"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
->>>>>>> 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch