From f7edb1694e81f7cce317a14e6f26cf3090a4b11b Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 22 Jun 2022 18:20:29 -0400
Subject: [PATCH] powder that makes you say yes

---
 .../mob/living/carbon/human/species/station/teshari.dm        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/station/teshari.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm
index af3cb36ab6..17fe6606da 100644
--- a/code/modules/mob/living/carbon/human/species/station/teshari.dm
+++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm
@@ -64,11 +64,7 @@
 
 	ambiguous_genders = TRUE
 
-<<<<<<< HEAD
-	spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED	| SPECIES_NO_POSIBRAIN //CHOMPedit: This is overriden by teshari_vr.dm. Noting here for future reference.
-=======
 	spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
->>>>>>> a423e9e3a0... Merge pull request #13086 from VOREStation/upstream-merge-8649
 	appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR
 	bump_flag = MONKEY
 	swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL