From aa34e962467952a7bc6677b2ddf6581d373d859f Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 28 Aug 2022 19:22:10 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../carbon/human/species/station/xenochimera_trait_vr.dm       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm b/code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm
index 6c8baec241..663e6eec76 100644
--- a/code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/station/xenochimera_trait_vr.dm
@@ -64,8 +64,6 @@
 	excludes = list(/datum/trait/positive/winged_flight/xenochimera)
 	custom_only = FALSE
 
-<<<<<<< HEAD
-=======
 /datum/trait/positive/winged_flight/xenochimera
 	name = "Xenochhimera: Winged Flight"
 	desc = "Allows you to fly by using your wings. Don't forget to bring them!"
@@ -73,7 +71,6 @@
 	excludes = list(/datum/trait/positive/aquatic/xenochimera)
 	custom_only = FALSE
 
->>>>>>> df05951dd6... Merge pull request #13573 from Cameron653/AQUATIC_LIFE
 /* // Commented out in lieu of finding a better solution.
 /datum/trait/neutral/coldadapt/xenochimera
 	sort = TRAIT_SORT_SPECIES