From 3d593599970c85ab488bc4c85e7ebff0d01b500f Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Mon, 7 Jan 2002 04:08:36 +0000 Subject: [PATCH] Remove CVS conflicts git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270602 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/defaults.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties index ebd7502fe..5cd1e8d0c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties +++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties @@ -58,12 +58,9 @@ bunzip2=org.apache.tools.ant.taskdefs.BUnzip2 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