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

---
 code/modules/mob/living/carbon/human/human_defines_vr.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm
index ab373e91a8..16b5097e46 100644
--- a/code/modules/mob/living/carbon/human/human_defines_vr.dm
+++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm
@@ -8,11 +8,8 @@
 	var/ability_flags = 0	//Shadekin abilities/potentially other species-based?
 	var/sensorpref = 5		//Suit sensor loadout pref
 	var/wings_hidden = FALSE
-<<<<<<< HEAD
 	var/nutrition_hidden = FALSE // Chomp Edit
-=======
 	var/tail_hidden = FALSE
->>>>>>> 6fe6af5879... Merge pull request #13569 from Cameron653/TAIL_TOGGLE
 
 /mob/living/carbon/human/proc/shadekin_get_energy()
 	var/datum/species/shadekin/SK = species