------------------------------------------------------------
revno: 1698
committer: Lars Helge Oeverland <[email protected]>
branch nick: trunk
timestamp: Thu 2010-03-25 18:42:43 +0100
message:
Minor fix
modified:
dhis-2/dhis-web/dhis-web-mapping/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/pom.xml'
--- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 17:25:47 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-25 17:42:43 +0000
@@ -75,9 +75,6 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
-<<<<<<< TREE
- </dependency>
-=======
</dependency>
<!-- JSON -->
@@ -89,8 +86,6 @@
<classifier>jdk15</classifier>
</dependency>
->>>>>>> MERGE-SOURCE
-
<!-- Batik -->
<dependency>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
