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_collations.php
+++ b/server_collations.php
@@ -95,6 +95,6 @@ unset($table_row_count);
 echo '</table>' . "\n"
   . '</div>' . "\n";

-require_once './libraries/footer.inc.php';
+require './libraries/footer.inc.php';

 ?>