aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorChris Toshok <toshok@src.gnome.org>2002-05-04 05:05:29 +0800
committerChris Toshok <toshok@src.gnome.org>2002-05-04 05:05:29 +0800
commit7719a8ad66b24d15a511e1b6c648dda4e36a6973 (patch)
tree27759ca78acb6bf27508676a681a57a5d72d1c38 /addressbook
parentb8986932939ab4caf9ded15893d54495f1964da3 (diff)
downloadgsoc2013-evolution-7719a8ad66b24d15a511e1b6c648dda4e36a6973.tar
gsoc2013-evolution-7719a8ad66b24d15a511e1b6c648dda4e36a6973.tar.gz
gsoc2013-evolution-7719a8ad66b24d15a511e1b6c648dda4e36a6973.tar.bz2
gsoc2013-evolution-7719a8ad66b24d15a511e1b6c648dda4e36a6973.tar.lz
gsoc2013-evolution-7719a8ad66b24d15a511e1b6c648dda4e36a6973.tar.xz
gsoc2013-evolution-7719a8ad66b24d15a511e1b6c648dda4e36a6973.tar.zst
gsoc2013-evolution-7719a8ad66b24d15a511e1b6c648dda4e36a6973.zip
doh, remove >>>>>'s
svn path=/trunk/; revision=16682
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