Add support for systemd path units

[chef.git] / cookbooks / mediawiki / templates / default / LocalSettings.php.erb

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 9f2e7f5a2805797de912b80515f2d64c81d1ff66..80a5e8710e29e62b7accfe9055ecefa01318f06b 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -149,7 +149,7 @@ $wgRightsIcon = "/cc-wiki.png";
 # Path to the GNU diff3 utility. Used for conflict resolution.
 $wgDiff3 = "/usr/bin/diff3";
 
 # Path to the GNU diff3 utility. Used for conflict resolution.
 $wgDiff3 = "/usr/bin/diff3";
 

-#$wgExternalDiffEngine = 'wikidiff2';
+$wgExternalDiffEngine = 'wikidiff2';

 
 # Query string length limit for ResourceLoader. You should only set this if
 # your web server has a query string length limit (then set it to that limit),
 
 # Query string length limit for ResourceLoader. You should only set this if
 # your web server has a query string length limit (then set it to that limit),