From b981bafc4194716384aa3aabe6b9b7a2e8493f66 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 13 Nov 2022 16:52:49 -0500
Subject: [PATCH] powder that makes you say yes

---
 .../carbon/human/species/station/xenochimera_trait_vr.dm      | 4 ----
 1 file changed, 4 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 a2b2318cf3..023a9272cb 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
@@ -43,11 +43,7 @@
 	cost = 0
 	category = 0
 	custom_only = FALSE
-<<<<<<< HEAD
-	var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/chimera, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) // CHOMPEdit: Fix 'chimera unarmed attacks with this trait
-=======
 	var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/chimera, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) // Fixes the parent forgetting to add 'chimera-specific claws
->>>>>>> c86ab5fed8... Merge pull request #14078 from Rykka-Stormheart/shep-dev-chimera-attack-fix
 
 /datum/trait/positive/snowwalker/xenochimera
 	sort = TRAIT_SORT_SPECIES