From ddf28fad89e75a674542f5faae719a8bb2425092 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:51:33 -0400
Subject: [PATCH] Update civilian.dm

---
 code/datums/outfits/jobs/civilian.dm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/datums/outfits/jobs/civilian.dm b/code/datums/outfits/jobs/civilian.dm
index 361530de04..c8d588a145 100644
--- a/code/datums/outfits/jobs/civilian.dm
+++ b/code/datums/outfits/jobs/civilian.dm
@@ -6,20 +6,18 @@
 	name = OUTFIT_JOB_NAME("Visitor")
 	id_pda_assignment = "Visitor"
 	uniform = /obj/item/clothing/under/assistantformal
-<<<<<<< HEAD
+
 //VOREStation Add - Interns
 /decl/hierarchy/outfit/job/assistant/intern
 	name = OUTFIT_JOB_NAME("Intern")
 	id_type = /obj/item/weapon/card/id/civilian
 //VOREStation Add End - Interns
-=======
 
 /decl/hierarchy/outfit/job/assistant/resident
 	name = OUTFIT_JOB_NAME("Resident")
 	id_pda_assignment = "Resident"
 	uniform = /obj/item/clothing/under/color/white
 
->>>>>>> 9436bdb... Merge pull request #6725 from Meghan-Rossi/job_description_alt
 /decl/hierarchy/outfit/job/service
 	l_ear = /obj/item/device/radio/headset/headset_service
 	hierarchy_type = /decl/hierarchy/outfit/job/service