From 16a599fd795ca72b8de7c5e4cfd70480b647565a Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Wed, 31 Mar 2021 05:18:37 -0400
Subject: [PATCH] Update randomverbs.dm

---
 code/modules/admin/verbs/randomverbs.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index cfe156c40ee..26e30011290 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -529,11 +529,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			job_master.EquipRank(new_character, charjob, 1)
 			new_character.mind.assigned_role = charjob
 			new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
-<<<<<<< HEAD
 		//equip_custom_items(new_character)	//VOREStation Removal
-=======
-		equip_custom_items(new_character)
->>>>>>> 7d1536b... Merge pull request #8017 from Novacat/nova-alerts
 
 	//If desired, add records.
 	if(records)