aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/ChangeLog')
-rw-r--r--addressbook/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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 <trow@ximian.com>
* backend/pas/pas-book.c (pas_book_check_queue): Added paranoid