mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/10073] Remove language string from rebase conflict

Browse Source 
PHPBB3-10073
This commit is contained in:
Joas Schilling
2014-05-03 16:01:32 +02:00
parent d3f65cd66e
commit d1fb8d3c9e
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/memberlist.php
View File

@@ -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',