commit | 0b6a0d7f118c7fed8a20b0372a262b5b8e898693 | [log] [tgz] |
---|---|---|
author | Magesh Umasankar <umagesh@apache.org> | Sat Jun 22 23:46:50 2002 +0000 |
committer | Magesh Umasankar <umagesh@apache.org> | Sat Jun 22 23:46:50 2002 +0000 |
tree | 1a2d4caf6b1123f008eca86648f40d2abe044bef | |
parent | 6bd8d6e938a45868902ecd1092858e8372933c7c [diff] |
Remove conflict resolution cruft. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272969 13f79535-47bb-0310-9956-ffa450edef68