From ff64c3cd2a76c01f0570d7e1b33743569196935f Mon Sep 17 00:00:00 2001
From: Xkeeper <xkeeper@gmail.com>
Date: Sun, 4 Nov 2018 14:52:20 -0800
Subject: [PATCH] [fix #18] real cool to leave that merge crap in there >_<

---
 newthread.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/newthread.php b/newthread.php
index 0247dc9..c275a76 100644
--- a/newthread.php
+++ b/newthread.php
@@ -68,11 +68,6 @@
 		<br>$radio=iconid value=-1 $checked>&nbsp;None&nbsp; &nbsp; &nbsp;
 		Custom: $inpt=custposticon SIZE=40 MAXLENGTH=100 VALUE=\"". stripslashes($custposticon) ."\">
 	";
-<<<<<<< Updated upstream
-	$subject=htmlspecialchars($subject);
-	$question=htmlspecialchars($question);
-=======
->>>>>>> Stashed changes
 
 	if ($nosmilies)	$nosmilieschk	= " checked";
 	if ($nohtml)	$nohtmlchk	= " checked";
@@ -289,12 +284,6 @@
 						$tccell2ls colspan=3>Multi-voting is $mlt.
 						$tblend<br>$tblstart
 					";
-<<<<<<< Updated upstream
-					$subject = htmlspecialchars(stripslashes($subject));
-					$question = htmlspecialchars(stripslashes($question));
-					$briefing = htmlspecialchars(stripslashes($briefing));
-=======
->>>>>>> Stashed changes
 				}
 				loadtlayout();
 				$ppost=$user;