summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
1 files changed, 2 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a368cf2..3b45ca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,8 +18,8 @@
2006-12-06 Kevin Kenny <kennykb@acm.org>
- * tests/expr.test (expr-47.12): Improved error reporting in hopes
- of having more information to pursue [Bug 1609936].
+ * tests/expr.test (expr-47.12): Improved error reporting in hopes of
+ having more information to pursue [Bug 1609936].
2006-12-05 Andreas Kupries <andreask@activestate.com>
@@ -55,7 +55,6 @@
causing old TM versions to be provided in preference to newer TM
versions. Thanks to Julian Noble for discovering the issue.
->>>>>>> 1.3290
2006-12-04 Donal K. Fellows <dkf@users.sf.net>
TIP#267 IMPLEMENTATION