From 960df853439f43f46f34cff74b645f50f96ab72f Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 24 Jun 2019 16:11:46 -0400
Subject: [PATCH] Update generic.dm

---
 code/modules/mob/language/generic.dm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/language/generic.dm b/code/modules/mob/language/generic.dm
index 9342f79b12..8fa9efcd73 100644
--- a/code/modules/mob/language/generic.dm
+++ b/code/modules/mob/language/generic.dm
@@ -64,12 +64,8 @@
 	exclaim_verb = "insinuates"
 	colour = "terminus"
 	key = "4"
-<<<<<<< HEAD
 	// flags = WHITELISTED (VOREstation edit)
-=======
-	flags = WHITELISTED
-	partial_understanding = list(LANGUAGE_SOL_COMMON = 20)
->>>>>>> 1efb235... Merge pull request #5842 from Anewbe/language_buffs
+	// partial_understanding = list(LANGUAGE_SOL_COMMON = 20) (VOREStation Edit: It is a Zorren language now)
 	syllables = list (".a", "spa", "pan", "blaif", "stra", "!u", "!ei", "!am", "by", ".y", "gry", "zbly", "!y", "fl",
  	"sm", "rn", "cpi", "ku", "koi", "pr", "glau", "stu", "ved", "ki", "tsa", "xau", "jbu", "sny", "stro", "nu",
  	"uan", "ju", "!i", "ge", "luk", "an", "ar", "at", "es", "et", "bel", "ki", "jaa", "ch", "ki", "gh", "ll", "uu", "wat")
@@ -218,4 +214,4 @@
 			)
 
 /datum/language/gibberish/can_speak_special(var/mob/speaker)
-	return TRUE	//Anyone can speak gibberish
\ No newline at end of file
+	return TRUE	//Anyone can speak gibberish