From f0fef90aeddb417c8065f4e0818596710ddab541 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 4 Jun 2022 20:20:04 -0400
Subject: [PATCH] powder that makes you say yes

---
 tgui/packages/tgui/interfaces/VorePanel.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js
index b6863f3cbe..b9232cecf1 100644
--- a/tgui/packages/tgui/interfaces/VorePanel.js
+++ b/tgui/packages/tgui/interfaces/VorePanel.js
@@ -553,11 +553,8 @@ const VoreSelectedBellyOptions = (props, context) => {
     contaminate_flavor,
     contaminate_color,
     egg_type,
-<<<<<<< HEAD
-    vorespawn_blacklist,
-=======
     save_digest_mode,
->>>>>>> f3b5098a9f... Merge pull request #13028 from lm40/modes
+    vorespawn_blacklist,
   } = belly;
 
   return (