Merge branch 'master' of github.com:savetheinternet/Tinyboard into jamer

1 files changed, 3 insertions, 6 deletions

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))));

 		}