Index: openacs-4/packages/acs-admin/www/users/merge-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-confirm.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-admin/www/users/merge-confirm.adp 13 Aug 2007 06:11:12 -0000 1.3 +++ openacs-4/packages/acs-admin/www/users/merge-confirm.adp 29 Jul 2008 22:04:14 -0000 1.4 @@ -14,7 +14,7 @@ These accounts will be merged and the good and final account will be:

- Portrait of @to_user_id@ + Portrait of @to_user_id@
@to_first_names@ @to_last_name@ (@to_email@)

@@ -27,7 +27,7 @@
- + Yes, I'm sure that I don't need the account @from_email@ anymore!.