diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-05-21 12:33:03 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-05-21 12:33:03 +0000 |
| commit | ed51549ed7f98d56ba60eba1d16f3c9eba91c9db (patch) | |
| tree | b0aedeadd405ca0de1362d5e07ef665c78680625 /archiva-modules | |
| parent | facd5173ce0d98bea18ec1fed091970d11d0d2a3 (diff) | |
| download | archiva-ed51549ed7f98d56ba60eba1d16f3c9eba91c9db.tar.gz archiva-ed51549ed7f98d56ba60eba1d16f3c9eba91c9db.zip | |
fix bad merge
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125685 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml | 4 |
1 files changed, 1 insertions, 3 deletions
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 |