MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'liana/edu'

Browse Source 
# Conflicts:
#	python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
#	python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java
This commit is contained in:
liana.bakradze
2016-03-14 14:59:30 +03:00
parent b376b6a53b f232d37361
commit 64a2edbc55
132 changed files with 301 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-python/student-python/resources/META-INF/plugin.xml
-1
View File
@@ -18,7 +18,6 @@
<depends>com.intellij.modules.lang</depends>
<depends>com.intellij.modules.python</depends>
<depends>com.jetbrains.edu.interactivelearning</depends>
<depends>com.jetbrains.edu.core</depends>
<depends>com.jetbrains.python.edu.core</depends>
<extensions defaultExtensionNs="com.intellij">