dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d242205
)
Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict
author
Catrope
<roan.kattouw@gmail.com>
Fri, 13 Apr 2012 00:48:03 +0000
(17:48 -0700)
committer
Catrope
<roan.kattouw@gmail.com>
Fri, 13 Apr 2012 00:48:03 +0000
(17:48 -0700)
resolution there
Change-Id: I7d563851e8b89c249105e91ceed71f747732084f
maintenance/mergeMessageFileList.php
patch
|
blob
|
history
diff --git
a/maintenance/mergeMessageFileList.php
b/maintenance/mergeMessageFileList.php
index
d187dbe
..
8669fe3
100644
(file)
--- 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,