Resolve merge conflicts for upstream merge
This commit is contained in:
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user