]> source.dussan.org Git - archiva.git/commit
fix wrong merge
authorOlivier Lamy <olamy@apache.org>
Thu, 20 Mar 2014 23:28:10 +0000 (23:28 +0000)
committerOlivier Lamy <olamy@apache.org>
Thu, 20 Mar 2014 23:28:10 +0000 (23:28 +0000)
commit269ede5bf074376a507385bba990255624b811a0
treee240903341a18b1823ea77b834c82a1302a079f2
parente72bb0a3a27a83430b5005af30d075b7334a2213
fix wrong merge

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1579832 13f79535-47bb-0310-9956-ffa450edef68
archiva-docs/src/site/apt/adminguide/logging.apt