From 03ee5a9303744358e2aec20d96980e737499a91d Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 29 Sep 2017 23:43:39 -0500
Subject: [PATCH] Update preferences.dm

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

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index b576829240..ad0e9ba50e 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -274,10 +274,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<div class='statusDisplay'><center><img src=previewicon.png width=[preview_icon.Width()] height=[preview_icon.Height()]></center></div>"
 
 			dat += "</td></tr></table>"
-<<<<<<< HEAD
 //			dat += "<b>Size:</b> <a href='?_src_=prefs;preference=character_size;task=input'>[character_size]</a><BR>"
 			dat += "<br>"
-=======
 
 			dat += "<h2>Body</h2>"
 			dat += "<a href='?_src_=prefs;preference=all;task=random'>Random Body</A> "
@@ -441,8 +439,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 			dat += "</tr></table>"
 
->>>>>>> 4178c20... Configuration datum refactor (#30763)
-
 		if (1) // Game Preferences
 			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
 			dat += "<h2>General Settings</h2>"