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/db_create.php
+++ b/db_create.php
@@ -11,6 +11,7 @@
 require_once './libraries/common.inc.php';
 $GLOBALS['js_include'][] = 'functions.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+
 require_once './libraries/mysql_charsets.lib.php';

 PMA_checkParameters(array('new_db'));