fix bad merge

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125685 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
index dea50e2f06a6ceaeae81f4049d8f20ae04d32dcf..0e5db0da4453493bad753458a49aabb29613482e 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
@@ -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