diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
| commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /python/src/META-INF/pycharm-core.xml | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
| download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'python/src/META-INF/pycharm-core.xml')
| -rw-r--r-- | python/src/META-INF/pycharm-core.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml index 775d912b284a..13ba05db63f0 100644 --- a/python/src/META-INF/pycharm-core.xml +++ b/python/src/META-INF/pycharm-core.xml @@ -33,7 +33,7 @@ <projectConfigurable instance="com.jetbrains.python.configuration.PythonContentEntriesConfigurable"/> <projectConfigurable instance="com.jetbrains.python.buildout.BuildoutModulesConfigurable"/> - <projectConfigurable instance="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"/> + <projectConfigurable groupId="project" instance="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable"/> <projectConfigurable instance="com.jetbrains.python.configuration.PyDependenciesConfigurable"/> <directoryProjectConfigurator implementation="com.jetbrains.python.PythonSdkConfigurator" id="sdk" |