mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-04 22:58:10 +02:00
[ticket/10073] Remove language string from rebase conflict
PHPBB3-10073
This commit is contained in:
parent
d3f65cd66e
commit
d1fb8d3c9e
@ -121,7 +121,6 @@ $lang = array_merge($lang, array(
|
||||
'SELECT_SORT_METHOD' => 'Select sort method',
|
||||
'SENDER_EMAIL_ADDRESS' => 'Your email address',
|
||||
'SENDER_NAME' => 'Your name',
|
||||
'SEND_AIM_MESSAGE' => 'Send AIM message',
|
||||
'SEND_ICQ_MESSAGE' => 'Send ICQ message',
|
||||
'SEND_IM' => 'Instant messaging',
|
||||
'SEND_JABBER_MESSAGE' => 'Send Jabber message',
|
||||
|
Loading…
x
Reference in New Issue
Block a user