From 647f9c02b7367a6cab6ed554501ab0eea89fea0c Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Sat, 27 Oct 2001 18:27:17 +0000 Subject: oops, left a collision marker in svn path=/trunk/; revision=14219 --- addressbook/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'addressbook/ChangeLog') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b1a5153233..03385a89cf 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -24,7 +24,6 @@ (card_removed): don't touch on lookup (match): touch on lookup ->>>>>>> 1.878 2001-10-27 Jon Trowbridge * backend/pas/pas-book.c (pas_book_check_queue): Added paranoid -- cgit v1.2.3