From 69d1e97d2ebe90ae6c8d907ecf9f7b609cb5e75d Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 13 May 2019 22:43:00 -0400
Subject: [PATCH] Update character_setup.dm

---
 code/controllers/subsystems/character_setup.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/controllers/subsystems/character_setup.dm b/code/controllers/subsystems/character_setup.dm
index 09875f6227..36851b26d4 100644
--- a/code/controllers/subsystems/character_setup.dm
+++ b/code/controllers/subsystems/character_setup.dm
@@ -29,14 +29,10 @@ SUBSYSTEM_DEF(character_setup)
 		save_queue.len--
 
 		if(!QDELETED(prefs))
-<<<<<<< HEAD
 			prefs.save_preferences()
-=======
-			SScharacter_setup.queue_preferences_save(prefs)
->>>>>>> 59c8446... Merge pull request #6164 from Novacat/nova-runtimes
 
 		if(MC_TICK_CHECK)
 			return
 
 /datum/controller/subsystem/character_setup/proc/queue_preferences_save(var/datum/preferences/prefs)
-	save_queue |= prefs
\ No newline at end of file
+	save_queue |= prefs