From 8e79488e0ca888b9c111323c02b47f76f4e87d10 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 31 Jul 2020 16:47:36 -0400
Subject: [PATCH] Update loadout_head.dm

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

diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm
index 5bfccbd0b2..4a6437cea1 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -366,9 +366,6 @@
 
 /datum/gear/head/jingasa
 	display_name = "jingasa"
-<<<<<<< HEAD
-	path = /obj/item/clothing/head/jingasa
-=======
 	path = /obj/item/clothing/head/jingasa
 
 /datum/gear/head/sunflower_crown
@@ -386,4 +383,3 @@
 /datum/gear/head/rose_crown
 	display_name = "rose crown"
 	path = /obj/item/clothing/head/rose_crown
->>>>>>> 7a84236... Adds 2 uniforms, 1 accessory, and flower crowns to loadout (#7385)