From fcfd7acf7d066d4e425fc67f2b102558309b1320 Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Mon, 26 Dec 2022 15:31:25 -0700
Subject: [PATCH] powder that makes you say yes

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

diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 1dbad14825..43802bcc86 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -2529,7 +2529,4 @@ Departamental Swimsuits, for general use
 	icon_override = 'icons/vore/custom_onmob_vr.dmi'
 	item_state = "perrinrobes_s"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
-<<<<<<< HEAD
 End CHOMP Removal*/
-=======
->>>>>>> ccba3b03ae... Merge pull request #14252 from BonniePandora/Typo-grrr