cdmlib-remote/pom.xml merge=ours
cdmlib-persistence/pom.xml merge=ours
/LICENSE.txt -text
-/README.txt -text./cdmlib-commons/pom.xml
+/README.txt -text
cdmlib-commons/LICENSE.TXT -text
cdmlib-commons/README.TXT -text
cdmlib-commons/pom.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text
-cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/p6spy.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/json-views.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/oai-views.xml -text