From 7719a8ad66b24d15a511e1b6c648dda4e36a6973 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 3 May 2002 21:05:29 +0000 Subject: doh, remove >>>>>'s svn path=/trunk/; revision=16682 --- addressbook/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'addressbook') 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 * backend/ebook/e-card.c (e_card_list_send): Changed this to set a -- cgit v1.2.3