diff options
-rw-r--r-- | addressbook/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index b78e343fbb..9bb07f7968 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -157,7 +157,6 @@ (addressbook_model_set_uri): Use addressbook_load_source (). However, this needs a bit more work to get source UIDs instead of URIs. ->>>>>>> 1.1484 2003-11-26 JP Rosevear <jpr@ximian.com> * gui/widgets/Makefile.am: turn on deprecated gtk and libgnomeui |