lib/google-api-translate-java-0.92.jar,\\r
lib/odfdom-0.8.jar,\\r
lib/h2mig_pagestore_addon.jar,\\r
++<<<<<<< .working\r
+ lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
+ lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,\\r
+ lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,\\r
+ lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-io-3.4.0-SNAPSHOT.jar,\\r
+ lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-model-3.4.0-SNAPSHOT.jar,\\r
+ lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,\\r
+ lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-print-3.4.0-SNAPSHOT.jar,\\r
+ lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,\\r
+ lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,\\r
+ lib/cdmlib-services-3.4.0-SNAPSHOT.jar\r
++=======\r
+ lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
+ lib/jena-core-2.12.1-SNAPSHOT.jar,\\r
+ lib/jena-iri-1.1.1-SNAPSHOT.jar\r
++>>>>>>> .merge-rechts.r21823\r
jars.compile.order = .\r
output.. = bin/\r
source.. = src/main/java/,\\r