Removed conflict indicators from ChangeLog.
authorBill Haneman <billh@src.gnome.org>
Wed, 20 Nov 2002 17:10:51 +0000 (17:10 +0000)
committerBill Haneman <billh@src.gnome.org>
Wed, 20 Nov 2002 17:10:51 +0000 (17:10 +0000)
commit8f4a6da49a191e356b79995eb512717d084e127c
tree6387c0869d8a33b0cff9a2e31a25d06b93f39693
parent16b385624444f6c70fde45273cc46ab80a34f226
Removed conflict indicators from ChangeLog.
ChangeLog