Browse Source

Remove CVS conflicts

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270602 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 23 years ago
parent
commit
3d59359997
1 changed files with 0 additions and 3 deletions
  1. +0
    -3
      src/main/org/apache/tools/ant/taskdefs/defaults.properties

+ 0
- 3
src/main/org/apache/tools/ant/taskdefs/defaults.properties View File

@@ -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


Loading…
Cancel
Save