From 72a172464a5f9be5827fcbb350fc3cf90ede055f Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Mon, 27 Jun 2022 16:06:14 -0700
Subject: [PATCH] powder that makes you say yes

---
 code/modules/client/preference_setup/vore/07_traits.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm
index 75ea05f6db..cd87692f9d 100644
--- a/code/modules/client/preference_setup/vore/07_traits.dm
+++ b/code/modules/client/preference_setup/vore/07_traits.dm
@@ -439,13 +439,8 @@
 			if(conflict)
 				tgui_alert_async(usr, "You cannot take this trait and [conflict] at the same time. Please remove that trait, or pick another trait to add.", "Error")
 				return TOPIC_REFRESH
-<<<<<<< HEAD
-			if(path==/datum/trait/positive/linguist)	//CHOMPEdit
-				pref.num_languages = 12		//CHOMPEdit
-=======
 
 			instance.apply_pref(pref)
->>>>>>> a6f7e932ad... Merge pull request #13178 from Heroman3003/linguist
 			mylist += path
 			return TOPIC_REFRESH