merge fail
This commit is contained in:
parent
9d77a4cc4c
commit
cbfafeea36
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user