Skip to content

CANNOT_MERGE_SAME duplicate entry #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CANNOT_MERGE_SAME duplicate entry #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions language/en/acp_usermerge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <strong>%s</strong> with itself.',

Expand Down