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 dcc726a4b3..cf5eca729d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -108,8 +108,3 @@ Talon winter coat /datum/gear/suit/wintercoat/talon display_name = "winter coat, Talon" path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon -<<<<<<< HEAD -======= - - ->>>>>>> cfbe9e8e4e... Merge pull request #11990 from Runa-Dacino/OldSchool-Labcoats