From cbfafeea3636e222feb73cf42c24fec16bff71bd Mon Sep 17 00:00:00 2001 From: Michael Foster Date: Wed, 21 Aug 2013 22:36:48 +1000 Subject: [PATCH] merge fail --- inc/functions.php | 1 - 1 file changed, 1 deletion(-) diff --git a/inc/functions.php b/inc/functions.php index 98cf9d77..76865882 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1866,7 +1866,6 @@ function buildThread50($id, $return = false, $mod = false, $thread = null) { } else { file_write($board['dir'] . $config['dir']['res'] . sprintf($config['file_page50'], $id), $body); } ->>>>>>> a29a932... Make it possible to disable API, disable it by default } function rrmdir($dir) {