diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 16:01:32 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 02:14:38 +0200 |
| commit | d1fb8d3c9e9e154d356d4764b592369d0e8ea30f (patch) | |
| tree | 37e952973266ea15dc6e36cab96b15a40762c36b | |
| parent | d3f65cd66e4c3cbf2a8af45a7db99b40d0153214 (diff) | |
| download | forums-d1fb8d3c9e9e154d356d4764b592369d0e8ea30f.tar forums-d1fb8d3c9e9e154d356d4764b592369d0e8ea30f.tar.gz forums-d1fb8d3c9e9e154d356d4764b592369d0e8ea30f.tar.bz2 forums-d1fb8d3c9e9e154d356d4764b592369d0e8ea30f.tar.xz forums-d1fb8d3c9e9e154d356d4764b592369d0e8ea30f.zip | |
[ticket/10073] Remove language string from rebase conflict
PHPBB3-10073
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index b8f2adf42b..d900ababd1 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -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', |