Index: openacs-4/packages/acs-admin/www/users/merge.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-admin/www/users/merge.adp 30 Nov 2007 18:16:42 -0000 1.3 +++ openacs-4/packages/acs-admin/www/users/merge.adp 29 Jul 2008 22:04:14 -0000 1.4 @@ -18,7 +18,7 @@
ACCOUNT ONE

- Portrait of @user_id@ + Portrait of @user_id@

General Information of user one (@one_email@):