diff options
| author | Catrope <roan.kattouw@gmail.com> | 2012-04-12 17:48:03 -0700 |
|---|---|---|
| committer | Catrope <roan.kattouw@gmail.com> | 2012-04-12 17:48:03 -0700 |
| commit | e69afa4340372081eb558af5a8962ec3a0ea630c (patch) | |
| tree | 58b43ca177def01368fb976350fa6c2aab7e7057 /maintenance/mergeMessageFileList.php | |
| parent | d242205f7293858ba49c6d682f253484c90ba52d (diff) | |
| download | mediawikicore-e69afa4340372081eb558af5a8962ec3a0ea630c.tar.gz mediawikicore-e69afa4340372081eb558af5a8962ec3a0ea630c.zip | |
Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict
resolution there
Change-Id: I7d563851e8b89c249105e91ceed71f747732084f
Diffstat (limited to 'maintenance/mergeMessageFileList.php')
| -rw-r--r-- | maintenance/mergeMessageFileList.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php index d187dbe075f6..8669fe36c9e6 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, |