From ce4fa6b0f1ff8271d64d0ecc370da0190f202e46 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 14 May 2015 14:06:42 +0300
Subject: [PATCH] KT-4774 Hotkey conflict for "select all occurrences" and
 "convert java file to kotlin file" Changed shortcut to Ctrl-Alt-Shift-K

 #KT-4774 Fixed
---
 idea/src/META-INF/plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index fa797d8bc71..e93e6e49357 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -72,7 +72,7 @@
     </action>
     <action id="ConvertJavaToKotlin" class="org.jetbrains.kotlin.idea.actions.JavaToKotlinAction"
             text="Convert Java File to Kotlin File">
-      <keyboard-shortcut keymap="$default" first-keystroke="control alt shift J"/>
+      <keyboard-shortcut keymap="$default" first-keystroke="control alt shift K"/>
       <add-to-group group-id="CodeMenu" anchor="last"/>
     </action>