From 35a24db1aaf16acf09948f0d53129bda73cac2aa Mon Sep 17 00:00:00 2001 From: Ashish Patel Date: Thu, 4 Jun 2020 17:07:16 +0530 Subject: [PATCH] CANNOT_MERGE_SAME duplicate entry CANNOT_MERGE_SAME duplicate entry removed --- language/en/acp_usermerge.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/language/en/acp_usermerge.php b/language/en/acp_usermerge.php index dca48e3..78a86fa 100644 --- a/language/en/acp_usermerge.php +++ b/language/en/acp_usermerge.php @@ -27,8 +27,7 @@ 'VERSION' => 'Version', 'NO_USER_FOR_MERGE' => 'A specified user for merging could not be located within the database.', 'NO_USER_SPECIFIED' => 'A user for merging was not specified.', - 'CANNOT_MERGE_SAME' => 'You can’t merge and delete the same user.', - 'CANNOT_MERGE_SELF' => 'You can’t merge yourself.', + 'CANNOT_MERGE_SELF' => 'You can’t merge yourself.', 'CANNOT_MERGE_FOUNDER' => 'Founders can only be deleted by other founders.', 'CANNOT_MERGE_SAME' => 'You cannot merge the user account %s with itself.',