From 6df5ba3fcbc811cdba17709933f677edf3823311 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 7 Sep 2016 08:06:57 +0200
Subject: [PATCH] fix after merge

---
 .idea/codeStyleSettings.xml                              | 9 +++++++++
 .../com/intellij/diagnostic/JetBrainsAccountDialog.kt    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index e08227b860ba..3ff222636c51 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -32,6 +32,15 @@
         <option name="FORMATTER_TAGS_ENABLED" value="true" />
         <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
         <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+        <JetCodeStyleSettings>
+          <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+            <value>
+              <package name="java.util" withSubpackages="false" static="false" />
+              <package name="com.intellij.ui.layout" withSubpackages="true" static="false" />
+              <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+            </value>
+          </option>
+        </JetCodeStyleSettings>
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
diff --git a/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt b/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt
index 656feb7f187a..eefbe9514dff 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt
+++ b/platform/platform-impl/src/com/intellij/diagnostic/JetBrainsAccountDialog.kt
@@ -19,14 +19,14 @@ import com.intellij.credentialStore.CredentialAttributes
 import com.intellij.credentialStore.Credentials
 import com.intellij.ide.BrowserUtil
 import com.intellij.ide.passwordSafe.PasswordSafe
-import com.intellij.layout.*
-import com.intellij.layout.LCFlags.*
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogBuilder
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.dialog
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.ui.ClickListener
+import com.intellij.ui.layout.*
+import com.intellij.ui.layout.LCFlags.*
 import com.intellij.util.net.HttpConfigurable
 import java.awt.Component
 import java.awt.Cursor