Merge branch 'db-purge' of repo.wisemapping.org:wisemapping/wiseorg into db-purge

Conflicts: wise-webapp/src/test/resources/data/freemind/richtextnode.mmr
2012-11-01 21:43:27 -03:00
parent b4005c8159 24b4f4b190
commit ef88ee06de
6 changed files with 46 additions and 46 deletions
--- a/wise-webapp/src/test/resources/data/freemind/node-styles.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/node-styles.mmr
@@ -43,4 +43,4 @@
            </node>
        </node>
    </node>
-</map>
+</map>