From 6ba26cee36b933616c0922f3fda2abc658adfaac Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 9 Jan 2022 19:28:06 -0500
Subject: [PATCH] powder that makes you say yes

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

diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 4a7b9c8fcb..c4149326e2 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -1207,7 +1207,6 @@
 	for(var/I in examine_messages)
 		dupe.examine_messages += I
 
-<<<<<<< HEAD
 
 	// CHOMP reagent belly
 	//generated_reagents - strings
@@ -1245,11 +1244,7 @@
 	for(var/I in fullness5_messages)
 		dupe.fullness5_messages += I
 
-
-	//examine_messages - strings
-=======
 	//examine_messages_absorbed - strings
->>>>>>> b19948a0832... Merge pull request #12021 from Heroman3003/more-absorb-vore
 	dupe.examine_messages_absorbed.Cut()
 	for(var/I in examine_messages_absorbed)
 		dupe.examine_messages_absorbed += I