Update preferences.dm

2018-03-02 21:28:33 -05:00
parent 02b9f290dd
commit 0b4cdc2e69
1 changed files with 0 additions and 3 deletions
--- 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)