From 577085c73c7b6104a28ae6716387e5ea070db2b1 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Tue, 25 Apr 2023 20:34:32 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/emotes/definitions/audible_furry_vr.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm
index 3451bd00a7..df66e85bfc 100644
--- a/code/modules/emotes/definitions/audible_furry_vr.dm
+++ b/code/modules/emotes/definitions/audible_furry_vr.dm
@@ -238,8 +238,6 @@
 	key = "coyawoo5"
 	emote_message_3p = "lets out a scraggly, whine-awoo."
 	emote_sound = 'sound/voice/coyoteawoo5.ogg'
-<<<<<<< HEAD
-=======
 
 /decl/emote/audible/roarbark // Upstream port from CHOMP
 	key = "roarbark"
@@ -250,4 +248,3 @@
 	key = "dook"
 	emote_message_3p = "dooks."
 	emote_sound = 'sound/voice/FerretDook.ogg'
->>>>>>> 8d85ea8a88... Merge pull request #14800 from Wulfestwulf/ferretdooks