Resolve merge conflicts for upstream merge

This commit is contained in:
ninadsp
2010-07-29 19:17:25 +05:30
175 changed files with 76587 additions and 70379 deletions

View File

@@ -131,7 +131,7 @@ function PMA_auth_fails()
echo '</tr>' . "\n";
}
echo '</table>' . "\n";
require_once './libraries/footer.inc.php';
require './libraries/footer.inc.php';
return TRUE;
} // end of the 'PMA_auth_fails()' function