Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -234,6 +234,6 @@ while ($value = PMA_DBI_fetch_assoc($result)) {
 /**
 * Sends the footer
 */
-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';

 ?>