From 0d0d3ca4f953df5a2f60a8157f91e75b607e742a Mon Sep 17 00:00:00 2001
From: Robert Graham Merkel <robert.merkel@benambra.org>
Date: Thu, 14 Jun 2001 09:07:42 +0000
Subject: [PATCH] remove conflict marks from ChangeLog.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4682 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 ChangeLog | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 445cbfbd03..3758530394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,18 +53,17 @@
 
 	* src/gnome/dialog-column-view.c: more libglade work
 
+2001-06-13  Bill Gribble  <grib@billgribble.com>
+
+	* src/sc/qif-import/qif-guess-map.scm: fix bug in 
+	account name guessing 
+
 2001-06-12  Dave Peticolas  <dave@krondo.com>
 
 	* src/gnome/glade/report.glade: new file for old report dialogs
 
 	* src/gnome/dialog-column-view.c: use libglade
 
->>>>>>> 1.616
-2001-06-13  Bill Gribble  <grib@billgribble.com>
-
-	* src/sc/qif-import/qif-guess-map.scm: fix bug in 
-	account name guessing 
-
 2001-06-12  Dave Peticolas  <dave@krondo.com>
 
 	* src/gnome/dialog-price-editor.c: fix bug