From 00addc1b24da2e7124ef035b28eef33f26d1747b Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 25 Sep 2022 17:45:39 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/mob/new_player/sprite_accessories_ear_vr.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm
index 42dbce6fd4..6a9ede2499 100644
--- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm
@@ -860,8 +860,6 @@
 	extra_overlay = "altevian-inner"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
-<<<<<<< HEAD
-=======
 	
 /datum/sprite_accessory/ears/wilddog
 	name = "Wild Dog Ears"
@@ -871,4 +869,3 @@
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 	extra_overlay = "wild_doginner"
->>>>>>> c72edf2a81... Merge pull request #13802 from radiantAurora/radiantAurora-markings