You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2004/11/22 12:52:40 UTC
cvs commit: ant/src/main/org/apache/tools/ant/types defaults.properties
bodewig 2004/11/22 03:52:39
Modified: src/main/org/apache/tools/ant/types defaults.properties
Log:
Fix class name, make tests pass
Revision Changes Path
1.31 +1 -1 ant/src/main/org/apache/tools/ant/types/defaults.properties
Index: defaults.properties
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/defaults.properties,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- defaults.properties 22 Nov 2004 10:48:57 -0000 1.30
+++ defaults.properties 22 Nov 2004 11:52:39 -0000 1.31
@@ -36,4 +36,4 @@
concatfilter=org.apache.tools.ant.filters.ConcatFilter
issigned=org.apache.tools.ant.taskdefs.condition.IsSigned
ispingable=org.apache.tools.ant.taskdefs.optional.condition.IsPingable
-mavenrepository=org.apache.tools.ant.taskdefs.optional.repository.MavenRepository
+mavenrepository=org.apache.tools.ant.taskdefs.repository.MavenRepository
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvs commit: ant/src/main/org/apache/tools/ant/types defaults.properties
Posted by Peter Reilly <pe...@apache.org>.
Opps,
Soory, my conflict resultion got confused.
Peter
bodewig@apache.org wrote:
>bodewig 2004/11/22 03:52:39
>
> Modified: src/main/org/apache/tools/ant/types defaults.properties
> Log:
> Fix class name, make tests pass
>
> Revision Changes Path
> 1.31 +1 -1 ant/src/main/org/apache/tools/ant/types/defaults.properties
>
> Index: defaults.properties
> ===================================================================
> RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/defaults.properties,v
> retrieving revision 1.30
> retrieving revision 1.31
> diff -u -r1.30 -r1.31
> --- defaults.properties 22 Nov 2004 10:48:57 -0000 1.30
> +++ defaults.properties 22 Nov 2004 11:52:39 -0000 1.31
> @@ -36,4 +36,4 @@
> concatfilter=org.apache.tools.ant.filters.ConcatFilter
> issigned=org.apache.tools.ant.taskdefs.condition.IsSigned
> ispingable=org.apache.tools.ant.taskdefs.optional.condition.IsPingable
> -mavenrepository=org.apache.tools.ant.taskdefs.optional.repository.MavenRepository
> +mavenrepository=org.apache.tools.ant.taskdefs.repository.MavenRepository
>
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
>For additional commands, e-mail: dev-help@ant.apache.org
>
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org