# Conflicts:
# platform/lang-api/src/com/intellij/execution/configurations/ConfigurationType.java
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;