aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/ChangeLog
diff options
context:
space:
mode:
authorJon Trowbridge <trow@src.gnome.org>2001-10-28 02:27:17 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-10-28 02:27:17 +0800
commit647f9c02b7367a6cab6ed554501ab0eea89fea0c (patch)
treeeb28ff1b49a2e46032566e77be469f7afed1c30e /addressbook/ChangeLog
parent41fd8740f435090489e73b3540ace4d6dc1a18bf (diff)
downloadgsoc2013-evolution-647f9c02b7367a6cab6ed554501ab0eea89fea0c.tar.gz
gsoc2013-evolution-647f9c02b7367a6cab6ed554501ab0eea89fea0c.tar.zst
gsoc2013-evolution-647f9c02b7367a6cab6ed554501ab0eea89fea0c.zip
oops, left a collision marker in
svn path=/trunk/; revision=14219
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