Removed files created during the merge.

This commit is contained in:
Pavel Talanov
2012-02-21 21:36:03 +04:00
parent cc72098348
commit 8768716027
3 changed files with 2 additions and 18 deletions
View File
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="jdk" jdkName="IDEA IC-110.240" jdkType="IDEA JDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="frontend" />
<orderEntry type="module" module-name="frontend.java" />
</component>
</module>
+2 -3
View File
@@ -20,11 +20,10 @@
<orderEntry type="library" name="guava-10.0.1" level="application" />
<orderEntry type="library" name="js" level="application" />
<orderEntry type="library" name="idea-full" level="application" />
<orderEntry type="module" module-name="js" />
<orderEntry type="module" module-name="jslib" />
<orderEntry type="library" name="guava-10.0.1" level="project" />
<orderEntry type="module" module-name="cli" />
<orderEntry type="module" module-name="frontend.java" />
<orderEntry type="module" module-name="js" />
<orderEntry type="module" module-name="jslib" />
</component>
</module>