Revision 791033

Jump to revision:
Author:	maartenc
Date:	Fri Jul 3 22:41:39 2009 UTC (14 years, 10 months ago)
Changed paths:	3
Log Message:	Fixed some merge errors...

Changed paths

Path	Details
ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/Main.java	modified , text changed
ant/ivy/core/branches/2.1.0-rc2/src/java/org/apache/ivy/plugins/resolver/RepositoryResolver.java	modified , text changed
ant/ivy/core/branches/2.1.0-rc2/test/java/org/apache/ivy/core/resolve/ResolveTest.java	modified , text changed