fix bad merge

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125685 13f79535-47bb-0310-9956-ffa450edef68
2011-05-21 12:33:03 +00:00 · 2011-05-21 12:33:03 +00:00 · ed51549ed7
parent facd5173ce
commit ed51549ed7
1 changed files with 1 additions and 3 deletions
--- 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>