Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-22 09:10:08 -05:00 · 2014-11-22 09:10:08 -05:00 · ed6ba4210f
commit ed6ba4210f
parent 0489e3248d 02fcb6e746
1 changed files with 1 additions and 0 deletions
--- a/index.php
+++ b/index.php
@ -57,6 +57,7 @@ if (isset($_REQUEST['ajax_request']) && ! empty($_REQUEST['access_time'])) {
    exit;
 }

+// See FAQ 1.34
 if (! empty($_REQUEST['db'])) {
    $page = null;
    if (! empty($_REQUEST['table'])) {