You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/21 14:33:03 UTC
svn commit: r1125685 -
/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
Author: olamy
Date: Sat May 21 12:33:03 2011
New Revision: 1125685
URL: http://svn.apache.org/viewvc?rev=1125685&view=rev
Log:
fix bad merge
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml?rev=1125685&r1=1125684&r2=1125685&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml Sat May 21 12:33:03 2011
@@ -29,9 +29,7 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.maven.archiva.configuration"/>
-<<<<<<< HEAD
-=======
<!-- olamy could be removed as only here temporary for plexus-spring -->
<alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
->>>>>>> fae223b927f9c5616587cd0aa9b759856e779bed
+
</beans>
\ No newline at end of file