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.6 -r1.6.2.1 --- openacs-4/packages/acs-admin/www/users/merge.adp 3 Jul 2015 10:25:39 -0000 1.6 +++ openacs-4/packages/acs-admin/www/users/merge.adp 9 Jun 2016 08:52:50 -0000 1.6.2.1 @@ -16,27 +16,27 @@
- ACCOUNT ONE + ACCOUNT ONE

Portrait of @user_id@ -

General Information of user one (@one_email@):

+

General Information of user one (@one_email@):