]> source.dussan.org Git - archiva.git/commit
fix incorrect merge
authorBrett Porter <brett@apache.org>
Fri, 4 Dec 2009 04:22:20 +0000 (04:22 +0000)
committerBrett Porter <brett@apache.org>
Fri, 4 Dec 2009 04:22:20 +0000 (04:22 +0000)
commit9ff4303708009d35f1daa8bbbf31ad4aa9ec9c2b
treeaee1ed075dd9408f98bc1049a591203103cda3d9
parentfcd43810f5a86f3fb2bdeb49aff5e869e46fc8fe
fix incorrect merge

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@887053 13f79535-47bb-0310-9956-ffa450edef68
archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java