Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bad merge 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125685 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-05-21 12:33:03 +00:00
parent facd5173ce
commit ed51549ed7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml
View File

@ -29,9 +29,7 @@
<context:annotation-config/> <context:annotation-config/>
<context:component-scan base-package="org.apache.maven.archiva.configuration"/> <context:component-scan base-package="org.apache.maven.archiva.configuration"/>
<<<<<<< HEAD
=======
<!-- olamy could be removed as only here temporary for plexus-spring --> <!-- olamy could be removed as only here temporary for plexus-spring -->
<alias name="archivaConfiguration#default" alias="archivaConfiguration"/> <alias name="archivaConfiguration#default" alias="archivaConfiguration"/>
>>>>>>> fae223b927f9c5616587cd0aa9b759856e779bed
</beans> </beans>