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.8 -r1.9 --- openacs-4/packages/acs-admin/www/users/merge-confirm.adp 3 Jul 2015 10:25:39 -0000 1.8 +++ openacs-4/packages/acs-admin/www/users/merge-confirm.adp 7 Aug 2017 23:47:45 -0000 1.9 @@ -6,11 +6,11 @@

- + The user @from_first_names@ @from_last_name@ (@from_email@) will be deleted. - +

- + These accounts will be merged and the good and final account will be:

@@ -19,9 +19,9 @@ @to_first_names@ @to_last_name@ (@to_email@)

- +

- WARNING: Are you are absolutely sure to merge these accounts? + WARNING: Are you are absolutely sure to merge these accounts?