From 3d32276e6df1f709eac7831bcc5e089b45d48e25 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Thu, 7 Dec 2006 15:08:52 +0000
Subject: Remove erroneous line

---
 ChangeLog | 5 ++---
 1 file 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
-- 
cgit v0.12