From 0c880712f21e7b6e2cb732bbd8fb6666959efe59 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 21 Feb 2021 09:38:51 -0500
Subject: [PATCH] Update randomverbs.dm

---
 code/modules/admin/verbs/randomverbs.dm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 5a3edcf5782..12d0aeb3dfe 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -511,23 +511,17 @@ Traitors and the like can also be revived with the previous role mostly intact.
 				antag_data.add_antagonist(new_character.mind)
 				antag_data.place_mob(new_character)
 
-<<<<<<< HEAD
 	//VOREStation Add - Required for persistence
 	if(new_character.mind)
 		new_character.mind.loaded_from_ckey = picked_ckey
 		new_character.mind.loaded_from_slot = picked_slot
+	//VOREStation Add End
 
-=======
->>>>>>> e47f39e... Porting Fixes (#7891)
 	for(var/lang in picked_client.prefs.alternate_languages)
 		var/datum/language/chosen_language = GLOB.all_languages[lang]
 		if(chosen_language)
 			if(is_lang_whitelisted(src,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
 				new_character.add_language(lang)
-<<<<<<< HEAD
-	//VOREStation Add End
-=======
->>>>>>> e47f39e... Porting Fixes (#7891)
 
 	//If desired, apply equipment.
 	if(equipment)