From 342bde963e6a4e29ddb6d9f288a521391daf0fd3 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 27 Apr 2004 18:39:40 +0000 Subject: fixed merge conflicts svn path=/trunk/; revision=25637 --- addressbook/ChangeLog | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index ca0b356cc6..bf053d008d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -148,11 +148,13 @@ migrating the company phone numbers. 2004-04-21 Sivaiah Nallagatla - - * gui/component/addressbook.c (remove_parameters_from_uri) : added - a new function to striff off any parameters present after ';' in the uri - (load_source_auth_cb) (addressbook_authenticate) : call above function to - remove anything after ';' before passing uri to e-password calls + + * gui/component/addressbook.c (remove_parameters_from_uri) : added + a new function to striff off any parameters present after ';' in + the uri + (load_source_auth_cb) (addressbook_authenticate) : call above + function to remove anything after ';' before passing uri to + e-password calls 2004-04-21 Hans Petter Jansson @@ -213,7 +215,6 @@ * gui/contact-editor/e-contact-editor.c (new_target_cb): addressbook_show_load_error_dialog -> eab_load_error_dialog. ->>>>>>> 1.1665 2004-04-19 Rodney Dawes * gui/contact-editor/contact-editor.glade: Set the default image for -- cgit