From bc38370a9f70158aae761d5162b590d75df8696d Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 28 Aug 2022 19:16:52 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/mob/living/carbon/human/emote_vr.dm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm
index 87908abe6c..b98d28285b 100644
--- a/code/modules/mob/living/carbon/human/emote_vr.dm
+++ b/code/modules/mob/living/carbon/human/emote_vr.dm
@@ -62,7 +62,6 @@
 		message = "hides their wings."
 	visible_message("[src] [message]")
 
-<<<<<<< HEAD
 // Chomp Edit Start
 /mob/living/carbon/human/verb/hide_nutrition_vr()
 	set name = "Show/Hide Nutrition Levels"
@@ -71,7 +70,7 @@
 	nutrition_hidden = !nutrition_hidden
 	to_chat(src, "Players will [nutrition_hidden ? "no longer" : "now"] see your nutrition levels.")
 // Chomp Edit End
-=======
+
 /mob/living/carbon/human/verb/hide_tail_vr()
 	set name = "Show/Hide tail"
 	set category = "IC"
@@ -94,4 +93,3 @@
 	else
 		message = "hides their tail."
 	visible_message("[src] [message]")
->>>>>>> 6fe6af5879... Merge pull request #13569 from Cameron653/TAIL_TOGGLE