remove conflict marks from ChangeLog.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4682 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Robert Graham Merkel 2001-06-14 09:07:42 +00:00
parent 41e2e5671d
commit 0d0d3ca4f9

View File

@ -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