Revision 1125685

Jump to revision:
Author:	olamy
Date:	Sat May 21 12:33:03 2011 UTC (12 years, 11 months ago)
Changed paths:	1
Log Message:	fix bad merge

Changed paths

Path	Details
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml	modified , text changed