From d1fb8d3c9e9e154d356d4764b592369d0e8ea30f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 3 May 2014 16:01:32 +0200 Subject: [PATCH] [ticket/10073] Remove language string from rebase conflict PHPBB3-10073 --- phpBB/language/en/memberlist.php | 1 - 1 file changed, 1 deletion(-) 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',