From 2f4c8a8ce1d7fb3917aa76c6adfb77f7f8954163 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 27 Apr 2019 22:35:05 -0400
Subject: [PATCH] Update assistant.dm

---
 code/game/jobs/job/assistant.dm | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index 00cbe8e4223..b79314b8716 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -39,22 +39,13 @@
 	access = list()
 	minimal_access = list()
 	outfit_type = /decl/hierarchy/outfit/job/assistant
-<<<<<<< HEAD
 	timeoff_factor = 0
 /datum/job/assistant/New()
 	..()
 	if(config)
 		total_positions = config.limit_visitors
 		spawn_positions = config.limit_visitors
-=======
-	alt_titles = list(
-		"Technical Assistant",
-		"Medical Intern",
-		"Research Assistant",
-		"Visitor" = /decl/hierarchy/outfit/job/assistant/visitor
-	)
 
->>>>>>> 1e71944... Merge pull request #6137 from Neerti/it's_time_to_stop
 /datum/job/assistant/get_access()
 	if(config.assistant_maint)
 		return list(access_maint_tunnels)