aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index f1528492e6..41d23431a9 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -61,7 +61,6 @@
menu item if there are no email addresses in the listed contacts.
Fixes bug #1298.
->>>>>>> 1.1041
2002-04-30 Christopher James Lahey <clahey@ximian.com>
* backend/ebook/e-card.c (e_card_list_send): Changed this to set a