From ab70f3fb1a541a41269fdc3ffe030c7e352eeb23 Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Wed, 20 May 2020 15:55:48 -0400
Subject: [PATCH] Update appearance.dm

---
 code/modules/mob/living/carbon/human/appearance.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index 239c42c982..57206c05e2 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -22,12 +22,7 @@
 		return
 
 	src.gender = gender
-<<<<<<< HEAD
 	//reset_hair() //VOREStation Remove - Don't just randomize hair on gender swaps for prometheans.
-	update_icons_body()
-=======
-	reset_hair()
->>>>>>> 46b6bd1... Edit Appearance and Change Appearance update icon sex (#7193)
 	update_dna()
 	update_icons_body()
 	return 1