Fixed old merge-problem.

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