From c4e7bb07e5e6742cb18448cb6a5ebd628aba1897 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Thu, 23 Jun 2022 00:07:07 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/admin/verbs/randomverbs.dm | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index b1811cbcf0..56b3d2ba09 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -627,18 +627,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!holder)
 		return
 
-<<<<<<< refs/remotes/Upstream/master
-	var/input = sanitize(tgui_input_text(usr, "Please enter anything you want. Anything. Serious.", "What?", "", multiline = TRUE), extra = 0)
-	var/customname = sanitizeSafe(tgui_input_text(usr, "Pick a title for the report.", "Title"))
-=======
-<<<<<<< HEAD
-	var/input = sanitize(input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null, extra = 0)
-	var/customname = sanitizeSafe(input(usr, "Pick a title for the report.", "Title") as text|null)
-=======
 	var/input = sanitize(tgui_input_text(usr, "Please enter anything you want. Anything. Serious.", "What?", "", multiline = TRUE, prevent_enter = TRUE), extra = 0)
 	var/customname = sanitizeSafe(tgui_input_text(usr, "Pick a title for the report.", "Title"))
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
->>>>>>> Input Fixes
 	if(!input)
 		return
 	if(!customname)