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

---
 code/modules/admin/admin_report.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/admin/admin_report.dm b/code/modules/admin/admin_report.dm
index d386a291d0..bc1adbcfdc 100644
--- a/code/modules/admin/admin_report.dm
+++ b/code/modules/admin/admin_report.dm
@@ -174,11 +174,7 @@ world/New()
 	if(!found) 
 		to_chat(src, "<b>* An error occured, sorry.</b>")
 
-<<<<<<< HEAD
-	var/body = input(src.mob, "Enter a body for the news", "Body") as null|message
-=======
 	var/body = tgui_input_text(src.mob, "Enter a body for the news", "Body", multiline = TRUE, prevent_enter = TRUE)
->>>>>>> 9f14866f07... Merge pull request #13135 from ItsSelis/tgui-input-framework-hotfix
 	if(!body) return
 
 	found.body = body