From 25abd9e2b1955e348d2b2829fa797efd01ecb357 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 21 Mar 2022 14:18:06 -0400
Subject: [PATCH] powder that makes you say yes

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

diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm
index 12f636c92e..db5c267a28 100644
--- a/code/game/jobs/job/assistant_vr.dm
+++ b/code/game/jobs/job/assistant_vr.dm
@@ -21,13 +21,9 @@
 					  "Lab Assistant" = /datum/alt_title/intern_sci, //CHOMPEdit
 					  "Security Cadet" = /datum/alt_title/intern_sec,
 					  "Jr. Cargo Tech" = /datum/alt_title/intern_crg,
-<<<<<<< HEAD
-					  "Server" = /datum/alt_title/server)
-=======
 					  "Jr. Explorer" = /datum/alt_title/intern_exp,
 					  "Server" = /datum/alt_title/server,
 					  "Assistant" = /datum/alt_title/assistant)
->>>>>>> 51f1481f60... Merge pull request #12502 from Very-Soft/assistant
 	job_description = "An Intern does whatever is requested of them, often doing so in process of learning \
 						another job. Though they are part of the crew, they have no real authority."
 	timeoff_factor = 0 // Interns, noh