From adeae228ee2a59dfe6c81705d4d70d164ce81593 Mon Sep 17 00:00:00 2001
From: Marc Lehmann <pcg@src.gnome.org>
Date: Wed, 21 Oct 1998 19:15:52 +0000
Subject: [PATCH] Removed the conflict identifier I left in...

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9379f5e866..8fd5bc2ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,7 +35,6 @@ Tue Oct 20 23:20:40 BST 1998 Andy Thomas <alt@picnic.demon.co.uk>
 
 	Started to change some of the scripts to use the new widget types.
 
->>>>>>> 1.674
 1998-10-19  Christopher James Lahey  <clahey@umich.edu>
 
 	* app/docindex.c: New Drag & Drop works now.