From 01c9cf6479004fa77ba8caceb7704732b22a7793 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 10 Dec 2017 17:45:21 -0500
Subject: [PATCH] Update preferences.dm

---
 code/modules/client/preferences.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index a28f15d8ea..175a23c91e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -178,12 +178,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/list/exp
 	var/list/menuoptions
 
-<<<<<<< HEAD
+	var/action_buttons_screen_locs = list()
+
 	//citadel code
 	var/arousable = TRUE //Allows players to disable arousal from the character creation menu
-=======
-	var/action_buttons_screen_locs = list()
->>>>>>> f07421a... Makes actionbuttons remember positions where you locked them. (#33150)
 
 /datum/preferences/New(client/C)
 	parent = C