From 0b4cdc2e6985563d4c0fed921705967e1b932a98 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 2 Mar 2018 21:28:33 -0500
Subject: [PATCH] Update preferences.dm

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

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index c1b0a8e8e4..f2ef23f1ce 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1908,10 +1908,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		character.update_body()
 		character.update_hair()
 		character.update_body_parts()
-<<<<<<< HEAD
 		character.update_genitals()
-=======
 
 	if(CONFIG_GET(flag/roundstart_traits))
 		SStraits.AssignTraits(character, parent)
->>>>>>> ab9e2e8... Adds minor roundstart traits! (ala CDDA, etc.) (#35440)