aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/ChangeLog')
-rw-r--r--addressbook/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e6a35a9c74..b4946614a6 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -164,7 +164,6 @@
* conduit/address-conduit.c (add_record): unref ecard when done
->>>>>>> 1.898
2001-10-28 Jon Trowbridge <trow@ximian.com>
* backend/ebook/e-card.c (e_card_date_from_string): Expose this