From a9b92fee76d7cfa3b43a64e1346c060e444e8edf Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Tue, 7 Feb 2023 17:02:29 -0500
Subject: [PATCH] powder that makes you say yes

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

diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm
index 2a06ceec40..4a16b81edc 100644
--- a/code/modules/emotes/definitions/audible.dm
+++ b/code/modules/emotes/definitions/audible.dm
@@ -190,8 +190,6 @@
 	emote_sound = 'sound/effects/warble.ogg' // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
 	emote_message_3p = "warbles."
 
-<<<<<<< HEAD
-=======
 /decl/emote/audible/croon
 	key = "croon"
 	emote_message_3p = "croons..."
@@ -207,7 +205,6 @@
 	emote_message_3p = "croaks!"
 	emote_sound = 'sound/voice/croak_skrell.ogg'
 
->>>>>>> 7c14ead771... Merge pull request #14439 from Heroman3003/post-mirror-fixes
 /decl/emote/audible/vox_shriek
 	key = "shriek"
 	emote_message_3p = "SHRIEKS!"