From e68bf8d494b3503e732b89d3fbb3ddd52978e387 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 13 Nov 2022 16:54:44 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/modules/mob/living/carbon/human/emote.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 94f42c27da..6c03a47d47 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -158,8 +158,6 @@ var/list/_human_default_emotes = list(
 	/decl/emote/audible/mothscream,
 	/decl/emote/audible/mothchitter,
 	/decl/emote/audible/mothlaugh,
-<<<<<<< HEAD
-=======
 	/decl/emote/audible/multichirp,
 	/decl/emote/audible/gnarl,
 	/decl/emote/audible/teshsqueak,
@@ -168,9 +166,7 @@ var/list/_human_default_emotes = list(
 	/decl/emote/visible/bounce,
 	/decl/emote/visible/jiggle,
 	/decl/emote/visible/lightup,
-	/decl/emote/visible/vibrate
-
->>>>>>> 0f7edb4589... Merge pull request #14077 from TankTheBirb/lemme-chirp
+	/decl/emote/visible/vibrate,
 	//VOREStation Add End
 	//CHOMP Add start
 	/decl/emote/audible/prbt2