From 8aacd2c804a0d6ca8f757ce9bbe2967044fe5edb Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 11 Feb 2018 16:44:29 -0500
Subject: [PATCH] Update job_exp.dm

---
 code/modules/jobs/job_exp.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm
index ba1437d1e5..91aa958ae9 100644
--- a/code/modules/jobs/job_exp.dm
+++ b/code/modules/jobs/job_exp.dm
@@ -143,11 +143,7 @@ GLOBAL_PROTECT(exp_to_update)
 		L.update_exp_list(mins,ann)
 
 /datum/controller/subsystem/blackbox/proc/update_exp_db()
-<<<<<<< HEAD
-	SSdbcore.MassInsert(format_table_name("role_time"),GLOB.exp_to_update,TRUE)
-=======
 	SSdbcore.MassInsert(format_table_name("role_time"), GLOB.exp_to_update, "ON DUPLICATE KEY UPDATE minutes = minutes + VALUES(minutes)")
->>>>>>> 882edc3... Merge pull request #35555 from MrStonedOne/patch-479
 	LAZYCLEARLIST(GLOB.exp_to_update)
 
 //resets a client's exp to what was in the db.