Conflicts:

README.md config/database/mysql/apopulate-schemas.sql wise-webapp/pom.xml
2014-01-24 20:17:21 -03:00
parent ae604b1c70 7d6c26539d
commit 706031a641
8 changed files with 98 additions and 86 deletions
--- a/distribution/assembly/standalone-editor.xml
+++ b/distribution/assembly/standalone-editor.xml
@@ -6,7 +6,7 @@
        <format>zip</format>
    </formats>
    <files>
-           <file>
+        <file>
            <source>core-js/target/classes/core.js</source>
            <outputDirectory>/js</outputDirectory>
        </file>
@@ -14,10 +14,6 @@
            <source>mindplot/target/classes/mindplot-min.js</source>
            <outputDirectory>/js</outputDirectory>
        </file>
-        <file>
-            <source>mindplot/target/classes/mindplot.js</source>
-            <outputDirectory>/js</outputDirectory>
-        </file>
    </files>
    <fileSets>
        <fileSet>