Merge branch 'da/dumb_run'
authorDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Wed, 23 Aug 2017 15:52:55 +0000 (18:52 +0300)
committerDmitry Avdeev <dmitry.avdeev@jetbrains.com>
Wed, 23 Aug 2017 15:52:55 +0000 (18:52 +0300)
# Conflicts:
# platform/lang-api/src/com/intellij/execution/configurations/ConfigurationType.java

1  2 
platform/lang-api/src/com/intellij/execution/configurations/ConfigurationType.java
xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java

index a5cb4e8f9b73c71668895fc510506e91eff218a9,e340fc2c6b277e8ddfc3d0e646ef3845b610f7dc..3d4dafce07e2f9f303d356b79efd7a9e832bc5b3
@@@ -16,7 -16,7 +16,8 @@@
  package com.intellij.execution.configurations;
  
  import com.intellij.openapi.extensions.ExtensionPointName;
 +import org.jetbrains.annotations.Nls;
+ import com.intellij.openapi.project.DumbAware;
  import com.intellij.openapi.project.PossiblyDumbAware;
  import org.jetbrains.annotations.NonNls;
  import org.jetbrains.annotations.NotNull;