From ae246a23b4db0ab9e04f8960ff01f73c38cf3a8f Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 15 Aug 2021 00:02:47 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/vore/eating/belly_obj_vr.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index ca10652228..bb7ff5d12e 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -46,16 +46,12 @@
 	var/emote_time = 60						// How long between stomach emotes at prey (in seconds)
 	var/emote_active = TRUE					// Are we even giving emotes out at all or not?
 	var/next_emote = 0						// When we're supposed to print our next emote, as a world.time
-<<<<<<< HEAD
 	var/item_mode_serial = TRUE				// Serial/parallel item digestion mode. Affect one item at a time or all of them with damage divided between contents. CHOMPEdit
-||||||| parent of 44748560b6... Merge pull request #11398 from VOREStation/Arokha/przy
-=======
 	
 	// Generally just used by AI
 	var/autotransferchance = 0 				// % Chance of prey being autotransferred to transfer location
 	var/autotransferwait = 10 				// Time between trying to transfer.
 	var/autotransferlocation				// Place to send them
->>>>>>> 44748560b6... Merge pull request #11398 from VOREStation/Arokha/przy
 
 	//I don't think we've ever altered these lists. making them static until someone actually overrides them somewhere.
 	//Actual full digest modes