Revision 817851

Jump to revision:
Author:	maartenc
Date:	Tue Sep 22 21:36:24 2009 UTC (14 years, 9 months ago)
Changed paths:	2
Log Message:	Fixed old merge-problem.

Changed paths

Path	Details
ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/Main.java	modified , text changed
ant/ivy/core/branches/2.1.x/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java	modified , text changed