From f22e8b066c6c1943449d0ed81c590509ff438cfe Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 19 Feb 2022 18:51:17 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/modules/vore/fluffstuff/custom_clothes_vr.dm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 6061ff6d86..4aaaf40d7a 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -2420,10 +2420,7 @@ Departamental Swimsuits, for general use
 				H.update_inv_wear_suit()
 	else
 		RemoveHood_evelyn()
-<<<<<<< HEAD
-End CHOMP Removal*/
-=======
-
+		
 //Uncle_Fruit_VEVO - Bradley Khatibi
 /obj/item/clothing/shoes/fluff/airjordans
     name = "A pair of Air Jordan 1 Mid 'Black Gym Red's"
@@ -2431,4 +2428,5 @@ End CHOMP Removal*/
     icon_state = "airjordans"
     icon = 'icons/vore/custom_clothes_vr.dmi'
     icon_override = 'icons/vore/custom_onmob_vr.dmi'
->>>>>>> 34fd6460ac6... Merge pull request #12274 from Heroman3003/brad-drip
+
+End CHOMP Removal*/