From c1bd08a584ba10c4e08bd7fff4579fde13ab5248 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Tue, 30 Mar 2021 01:09:21 -0400
Subject: [PATCH] Update rig_pieces_vr.dm

---
 code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
index aac4651045..b9ca364883 100644
--- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
@@ -12,14 +12,8 @@
 		SPECIES_FENNEC 			= 'icons/mob/species/vulpkanin/helmet.dmi',
 		SPECIES_PROMETHEAN		= 'icons/mob/species/skrell/helmet.dmi',
 		SPECIES_VOX 			= 'icons/mob/species/vox/head.dmi',
-<<<<<<< HEAD
-		SPECIES_TESHARI         = 'icons/mob/species/seromi/head.dmi',
+		SPECIES_TESHARI         = 'icons/mob/species/teshari/head.dmi',
 		SPECIES_GREY_YW         = 'icons/mob/species/grey/helmet.dmi' /*ywedit*/
-||||||| parent of b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
-		SPECIES_TESHARI 		= 'icons/mob/species/seromi/head.dmi'
-=======
-		SPECIES_TESHARI 		= 'icons/mob/species/teshari/head.dmi'
->>>>>>> b4d376553b... Merge pull request #10025 from VOREStation/upstream-merge-7991
 		)