From 42617c07f70eb52d795cf1784d1d7b343cf7c6a5 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Tue, 30 Oct 2001 03:50:18 +0000 Subject: Removed conflict spew. svn path=/trunk/; revision=14416 --- addressbook/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'addressbook/ChangeLog') 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 * backend/ebook/e-card.c (e_card_date_from_string): Expose this -- cgit v1.2.3