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.7 -r1.8 --- openacs-4/packages/acs-admin/www/users/merge.adp 7 Aug 2017 23:47:45 -0000 1.7 +++ openacs-4/packages/acs-admin/www/users/merge.adp 3 Sep 2024 15:37:29 -0000 1.8 @@ -4,7 +4,7 @@

User Account Merge

- This is the user acccount merge wizard. You selected these accounts to merge: + This is the user account merge wizard. You selected these accounts to merge:

@@ -31,7 +31,7 @@ @one_email@
  • - Scren name: + Screen name: @one_screen_name@
  • @@ -160,7 +160,7 @@ @two_email@
  • - Scren name: + Screen name: @two_screen_name@