Resolve conflicts
authorValentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Wed, 18 May 2016 09:51:46 +0000 (12:51 +0300)
committerValentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Wed, 18 May 2016 09:51:46 +0000 (12:51 +0300)
commit2a1c8136f38346daa449f468e039aa3eebe6aa0c
treee5cda3fd509425bc4cfca0c0a29c5734b45bacc9
parentff5fa40396bf4811e996a8add60c1a48163bbacb
parentae0c6009151633e61b3d556e1189e718799730c4
Resolve conflicts
14 files changed:
python/educational-core/student/resources/META-INF/plugin.xml
python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java
python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java
python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java
python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Course.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyJavaFxToolWindow.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudySwingToolWindow.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
python/educational-core/student/student.iml
python/educational-python/resources/fileTemplates/internal/test_helper.py.ft
python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java