Index: openacs-4/packages/acs-admin/tcl/merge-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/tcl/merge-procs.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-admin/tcl/merge-procs.tcl	7 Aug 2017 23:47:45 -0000	1.4
+++ openacs-4/packages/acs-admin/tcl/merge-procs.tcl	5 Sep 2019 13:35:22 -0000	1.4.2.1
@@ -18,14 +18,14 @@
     them to to_user_id.
 
     @param from_user_id From user ID.
-    @param to_user_id To user ID. 
+    @param to_user_id To user ID.
 } {
     ns_log Notice "Running merge::MergeUserInfo"
     db_transaction {
 	if { ![db_0or1row to_user_portrait {}] &&  [db_0or1row from_user_portrait {}] } {
 	    db_dml upd_portrait {}
-	} 
-	
+	}
+
 	# get the permissions of the from_user_id
 	# and grant them to the to_user_id
 	db_foreach getfromobjs {} {
@@ -34,12 +34,12 @@
 	    if { ![db_string touserhas {} ] } {
 		# grant the permissions to to_user_id
 		permission::grant -object_id $from_oid -party_id $to_user_id -privilege $from_priv
-	    } 
+	    }
 	}
-	
+
 	ns_log notice "  Merging acs_objects"
-	
-	db_dml acs_objs_upd {} 	
+
+	db_dml acs_objs_upd {}
     }
     ns_log Notice "Finishing merge::MergeUserInfo"
 }