From 971ac1ff4083bafba93a8d00922673d465091b8a Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 6 Mar 2021 05:32:31 -0500
Subject: [PATCH] Update vorepanel_vr.dm

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

diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm
index 2bff8befee..4e20c61a55 100644
--- a/code/modules/vore/eating/vorepanel_vr.dm
+++ b/code/modules/vore/eating/vorepanel_vr.dm
@@ -965,7 +965,6 @@
 			. = TRUE
 
 	if(.)
-<<<<<<< HEAD
 		unsaved_changes = TRUE
 
 //CHOMPedit start: liquid belly procs
@@ -1140,8 +1139,3 @@
 				host.vore_selected.set_reagent_messages(new_message,"full5")
 			. = TRUE
 //CHOMPedit end
-||||||| parent of 013ff5ebd4... Merge pull request #9853 from Verkister/patch-37
-		unsaved_changes = TRUE
-=======
-		unsaved_changes = TRUE
->>>>>>> 013ff5ebd4... Merge pull request #9853 from Verkister/patch-37