fix merge conflicts

2010-08-21 07:46:57 -04:00
parent 7be8236208 a5417a0ce7
commit 82acbb2ba3
64 changed files with 5983 additions and 2503 deletions
--- a/main.php
+++ b/main.php
@@ -143,6 +143,14 @@ echo PMA_Config::getFontsizeForm();
 echo '</li>';

 echo '</ul>';
+
+// User preferences
+
+echo '<ul>';
+echo PMA_printListItem(__('More settings'), 'li_user_preferences',
+                    './prefs_manage.php?' . $common_url_query);
+echo '<ul>';
+
 echo '</div>';