Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>

ChangeLog

@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.3.4.0 (not yet released)
 - bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
 - bug #4661 Drag and drop file import always fails
+- bug #4651 don't open console with esc
 
 4.3.3.0 (2014-12-21)
 - bug       The "Recently used tables" setting should be with Nav panel

js/console.js

@@ -119,8 +119,8 @@ var PMA_console = {
 
             PMA_console.$consoleToolbar.children('.console_switch').click(PMA_console.toggle);
             $(document).keydown(function(event) {
-                // 27 keycode is ESC
-                if(event.keyCode === 27) {
+                // Ctrl + Alt + C
+                if(event.ctrlKey && event.altKey && event.keyCode === 67) {
                     PMA_console.toggle();
                 }
             });