From: Olivier Lamy <olamy@apache.org>
Date: Sat, 21 May 2011 12:33:03 +0000 (+0000)
Subject: fix bad merge
X-Git-Tag: archiva-1.4-M1~780
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ed51549ed7f98d56ba60eba1d16f3c9eba91c9db;p=archiva.git

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 dea50e2f0..0e5db0da4 100644
--- 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