From: Catrope <roan.kattouw@gmail.com>
Date: Fri, 13 Apr 2012 00:48:03 +0000 (-0700)
Subject: Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict
X-Git-Tag: 1.31.0-rc.0~23919^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=e69afa4340372081eb558af5a8962ec3a0ea630c;p=lhc%2Fweb%2Fwiklou.git

Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict
resolution there

Change-Id: I7d563851e8b89c249105e91ceed71f747732084f
---

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,