]> source.dussan.org Git - archiva.git/commit
fix bad merge
authorOlivier Lamy <olamy@apache.org>
Sat, 21 May 2011 12:33:03 +0000 (12:33 +0000)
committerOlivier Lamy <olamy@apache.org>
Sat, 21 May 2011 12:33:03 +0000 (12:33 +0000)
commited51549ed7f98d56ba60eba1d16f3c9eba91c9db
treeb0aedeadd405ca0de1362d5e07ef665c78680625
parentfacd5173ce0d98bea18ec1fed091970d11d0d2a3
fix bad merge

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125685 13f79535-47bb-0310-9956-ffa450edef68
archiva-modules/archiva-base/archiva-configuration/src/main/resources/META-INF/spring-context.xml