Resolve conflicts
[idea/community.git] / python / educational-core / student / resources / META-INF / plugin.xml
index 5652e347f6d6d10cb365493350e5058e3e1b64ab..b020355f8c1b40867915646243a62ed51ca94c7f 100644 (file)
@@ -3,7 +3,7 @@
   <id>com.jetbrains.edu.interactivelearning</id>
   <name>Educational plugin core</name>
   <version>2.0.4</version>
-  <idea-version since-build="143.403"/>
+  <idea-version since-build="162.75"/>
   <description><![CDATA[
       Educational plugin core for students. 
       ]]></description>
@@ -36,7 +36,9 @@
       <with attribute="implementationClass" implements="com.jetbrains.edu.learning.StudyLanguageManager"/>
     </extensionPoint>
     <extensionPoint qualifiedName="Edu.studyPluginConfigurator" interface="com.jetbrains.edu.learning.StudyPluginConfigurator"/>
+    <extensionPoint qualifiedName="Edu.studyActionsProvider" interface="com.jetbrains.edu.learning.StudyActionsProvider"/>
     <extensionPoint qualifiedName="Edu.studyTwitterPluginConfigurator" interface="com.jetbrains.edu.learning.StudyTwitterPluginConfigurator"/>
+    <extensionPoint qualifiedName="Edu.studyActionListener" interface="com.jetbrains.edu.learning.StudyActionListener"/>
     <extensionPoint qualifiedName="Edu.optionsProvider" beanClass="com.jetbrains.edu.learning.settings.StudyOptionsProviderEP">>
       <with attribute="instance" implements="com.jetbrains.edu.learning.settings.StudyOptionsProvider"/>
     </extensionPoint>
@@ -71,6 +73,9 @@
             text="Fill Answer Placeholders">
       <add-to-group group-id="HelpMenu" anchor="before" relative-to-action="HelpTopics"/>
     </action>
+    <action id="StudySwitchPanel" class="com.jetbrains.edu.learning.actions.StudySwitchTaskPanelAction"
+            text="Switch Task Description Panel">
+    </action>
 
   </actions>