summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-09 14:20:42 +0000
committerzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-09 14:20:42 +0000
commitc1cc4d2ff39ae80567f571a9aecdfc00edd5cb0e (patch)
tree00d51da00bb15aaa2b3257ebde33949b7f6c67ce
parentd3e36f8c7dc8399f02a53eb58913db6a375a1ecb (diff)
downloadATCD-c1cc4d2ff39ae80567f571a9aecdfc00edd5cb0e.tar.gz
deleted a unuseful line
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 506967febe5..2b056c6ac59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,7 +131,6 @@ Fri Jun 9 07:55:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
of bugzilla bug 2359, thanks to Olivier Brunet <o dot brunet at free dot fr>
for reporting this.
->>>>>>> 4.10432
Thu Jun 8 17:13:42 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
* ace/String_Base.h,