Workspace of DataONE_Mercury on master

src / main / resources / .svn / prop-base /

	applicationContext.xml.svn-base	Jun 6, 2016 4:27:32 PM	108 B	view
	daac_picklists.js.svn-base	Jun 6, 2016 4:27:32 PM	108 B	view
	hibernate.cfg.xml.svn-base	Jun 6, 2016 4:27:32 PM	108 B	view
	log4j.properties.svn-base	Jun 6, 2016 4:27:32 PM	108 B	view
	logging.properties.svn-base	Jun 6, 2016 4:27:32 PM	82 B	view
	Mercury3Properties.xml.svn-base	Jun 6, 2016 4:27:32 PM	108 B	view
	solrTxServiceFactoryProperties.xml.svn-base	Jun 6, 2016 4:27:32 PM	82 B	view
(all files in zip)