From 83ee015d5c563ea1b30cf4696deac89494f206f7 Mon Sep 17 00:00:00 2001
From: Konstantin Ulitin <konstantin.ulitin@jetbrains.com>
Date: Wed, 17 Sep 2014 19:58:30 +0400
Subject: [PATCH] remove duplicated registration of JSON plugin

---
 build/scripts/layouts.gant           | 1 -
 python/src/META-INF/pycharm-core.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 2cf7758c1d5b..d9f32faec925 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -76,7 +76,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "java-impl",
     "java-psi-impl",
     "java-structure-view",
-    "json",
     "jsp-spi",
     "manifest",
     "platform-main",
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml
index dccd77074d0f..ef26ab80462f 100644
--- a/python/src/META-INF/pycharm-core.xml
+++ b/python/src/META-INF/pycharm-core.xml
@@ -12,7 +12,6 @@
   <xi:include href="/META-INF/RemoteServers.xml" xpointer="xpointer(/idea-plugin/*)">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/JsonPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <application-components>
     <component>