summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-02-03 06:45:19 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-02-03 06:45:19 +0000
commit66a16581b2c2b847017d021c5abb9b6e3909afdd (patch)
tree33a5d1f3a966a02cd5257659d1b52ac8a25dfe11
parent1c33917ea63429a3811f2176ad3a0e6fd3bc37d7 (diff)
downloadATCD-66a16581b2c2b847017d021c5abb9b6e3909afdd.tar.gz
Thu Feb 2 23:59:37 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf4ca7abc19..ee5999c62a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,7 +52,6 @@ Thu Feb 2 06:15:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/run_test.lst:
Fixed another error in this file
->>>>>>> 4.9803
Wed Feb 1 20:33:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Event_Handler.h: