From 911313b084ee8f50ce19f6b9374f06315965fdf6 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 23 Mar 2015 20:21:38 +0300
Subject: [PATCH] Merge module 'serialization.jvm' into
 'descriptor.loader.java'

It was very small and there proved to be no point in separation of loading Java
classes and deserializing Kotlin classes

Original commit: 085bc2197b2457a345b03265b3f3a17b469d5c86
---
 jps/jps-plugin/jps-plugin.iml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml
index e1a14e4e2d8..ab02798a6c6 100644
--- a/jps/jps-plugin/jps-plugin.iml
+++ b/jps/jps-plugin/jps-plugin.iml
@@ -17,7 +17,6 @@
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="util" />