conor 02/01/06 20:08:36 Modified: src/main/org/apache/tools/ant/taskdefs defaults.properties Log: Remove CVS conflicts Revision Changes Path 1.104 +0 -3 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties Index: defaults.properties =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v retrieving revision 1.103 retrieving revision 1.104 diff -u -w -u -r1.103 -r1.104 --- defaults.properties 25 Dec 2001 06:13:56 -0000 1.103 +++ defaults.properties 7 Jan 2002 04:08:36 -0000 1.104 @@ -58,12 +58,9 @@ checksum=org.apache.tools.ant.taskdefs.Checksum waitfor=org.apache.tools.ant.taskdefs.WaitFor input=org.apache.tools.ant.taskdefs.Input -<<<<<<< defaults.properties loadfile=org.apache.tools.ant.taskdefs.LoadFile -======= manifest=org.apache.tools.ant.taskdefs.Manifest ->>>>>>> 1.100 # optional tasks script=org.apache.tools.ant.taskdefs.optional.Script netrexxc=org.apache.tools.ant.taskdefs.optional.NetRexxC
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
