From e69afa4340372081eb558af5a8962ec3a0ea630c Mon Sep 17 00:00:00 2001 From: Catrope Date: Thu, 12 Apr 2012 17:48:03 -0700 Subject: [PATCH] Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict resolution there Change-Id: I7d563851e8b89c249105e91ceed71f747732084f --- maintenance/mergeMessageFileList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php index d187dbe075..8669fe36c9 100644 --- a/maintenance/mergeMessageFileList.php +++ b/maintenance/mergeMessageFileList.php @@ -67,7 +67,7 @@ $s = "<" . "?php\n" . "## This file is generated by mergeMessageFileList.php. Do not edit it directly.\n\n" . "if ( defined( 'MW_NO_EXTENSION_MESSAGES' ) ) return;\n\n" . - '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n" . + '$wgExtensionMessagesFiles = ' . var_export( $wgExtensionMessagesFiles, true ) . ";\n\n"; $dirs = array( $IP, -- 2.20.1