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.7
--- 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 7 Aug 2017 23:47:45 -0000 1.7
@@ -16,27 +16,27 @@
- ACCOUNT ONE
+ ACCOUNT ONE
- General Information of user one (@one_email@):
+ General Information of user one (@one_email@):
-
Name:
- @one_first_names@ @one_last_name@
+ @one_first_names@ @one_last_name@
-
Email:
- @one_email@
+ @one_email@
-
Scren name:
- @one_screen_name@
+ @one_screen_name@
-
Username:
- @one_username@
+ @one_username@
-
User id:
@@ -80,7 +80,7 @@
- (more information)
+ ()
@@ -109,7 +109,7 @@
- Which is the good account?
+ Which is the good account?
@@ -145,27 +145,27 @@
- ACCOUNT TWO
+ ACCOUNT TWO
- General Information of user two (@two_email@):
+ General Information of user two (@two_email@):
-
Name:
- @two_first_names@ @two_last_name@
+ @two_first_names@ @two_last_name@
-
Email:
- @two_email@
+ @two_email@
-
Scren name:
- @two_screen_name@
+ @two_screen_name@
-
Username:
- @two_username@
+ @two_username@
-
User id:
@@ -209,7 +209,7 @@
- (more information)
+ ()
| | |