From 08a12bba53590b8397433792f30a34a194e3bd29 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sun, 11 Feb 2018 16:24:45 -0500
Subject: [PATCH] Fix sql error in exp updates

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

diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm
index 52b4a5de32..ba1437d1e5 100644
--- a/code/modules/jobs/job_exp.dm
+++ b/code/modules/jobs/job_exp.dm
@@ -143,7 +143,11 @@ 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.