Resolved conflicts

1 files changed, 1 insertions, 1 deletions

diff --git a/main.php b/main.php
index 1cb3a05483..9a78cba1c0 100644
--- a/main.php
+++ b/main.php
@@ -84,7 +84,7 @@ if ($server > 0
     ) {
         echo '<li id="li_select_server">';
         include_once 'libraries/select_server.lib.php';
-        PMA_select_server(true, true);
+        PMA_selectServer(true, true);
         echo '</li>';
     }