From 2aa452ee873742e73072a1cb84938532c36dd35b Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 29 Jun 2022 18:55:15 -0400
Subject: [PATCH] powder that makes you say yes

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

diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index 6e6db992c8..4dd7d3f531 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -143,16 +143,10 @@
 	var/new_size = tgui_input_number(usr, nagmessage, "Pick a Size", default, 600, 1)
 	if(size_range_check(new_size))
 		resize(new_size/100, uncapped = has_large_resize_bounds(), ignore_prefs = TRUE)
-<<<<<<< HEAD
 		if(temporary_form)	//CHOMPEdit - resizing both our forms
 			var/mob/living/L = temporary_form
 			L.resize(new_size/100, uncapped = has_large_resize_bounds(), ignore_prefs = TRUE)
 		//CHOMPEDIT - I don't need to be informed every time a prommie changes sizes
-=======
-		// I'm not entirely convinced that `src ? ADMIN_JMP(src) : "null"` here does anything
-		// but just in case it does, I'm leaving the null-src checking
-		log_admin("[key_name(src)] used the resize command in-game to be [new_size]% size. [src ? ADMIN_JMP(src) : "null"]")
->>>>>>> c94decbc74... Merge pull request #13194 from ItsSelis/tgui-inputfix
 
 /*
 //Add the set_size() proc to usable verbs. By commenting this out, we can leave the proc and hand it to species that need it.