summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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: