tree c2660f60eabe3f142686f30d1020af74eb98442e
parent cabe4a8266efe6fa221371a1686f2e7749b49f18
author Maarten Coene <maartenc@apache.org> 1253656398 +0000
committer Maarten Coene <maartenc@apache.org> 1253656398 +0000

Fixed old merge-problem.

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/branches/2.1.x@817856 13f79535-47bb-0310-9956-ffa450edef68