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 067be8e1e2..aa72d4d877 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -128,7 +128,6 @@
* gui/component/addressbook-component.c: Removed unused factory
variable.
->>>>>>> 1.757
2001-09-06 Chris Toshok <toshok@ximian.com>
* gui/component/addressbook-storage.c (notify_listener): new