From 6c20b0ab03e86e16bdf63ac4da92449ca6efc014 Mon Sep 17 00:00:00 2001 From: Savetheinternet Date: Fri, 5 Nov 2010 02:20:19 +1100 Subject: Remove excess --- post.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'post.php') diff --git a/post.php b/post.php index a69c7c8e..1c875f40 100644 --- a/post.php +++ b/post.php @@ -80,12 +80,9 @@ if($post['has_file']) { $size = $_FILES['file']['size']; if($size > MAX_FILESIZE) - error(sprintf3(ERR_FILESIZE, array( -<<<<<<< HEAD - 'sz'=>commaize($size), -======= - 'filesz'=>commaize($size), ->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89 + error(sprintf3(ERR_FILESIZE, array( + 'sz'=>commaize($size), + 'filesz'=>commaize($size), 'maxsz'=>commaize(MAX_FILESIZE)))); } -- cgit v1.3