Merge "installer: Remove additional newline in LocalSettings.php"

diff --combined includes/installer/LocalSettingsGenerator.php
index d4f4938,f8b46db..526d9b5
--- 1/includes/installer/LocalSettingsGenerator.php
--- 2/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@@ -287,7 -287,7 +287,7 @@@ class LocalSettingsGenerator 
                $serverSetting = "";
                if ( array_key_exists( 'wgServer', $this->values ) && $this->values['wgServer'] !== null ) {
                        $serverSetting = "\n## The protocol and server name to use in fully-qualified URLs\n";
-                       $serverSetting .= "\$wgServer = \"{$this->values['wgServer']}\";\n";
+                       $serverSetting .= "\$wgServer = \"{$this->values['wgServer']}\";";
                }
  
                switch ( $this->values['wgMainCacheType'] ) {
@@@ -334,10 -334,7 +334,10 @@@ if ( !defined( 'MEDIAWIKI' ) ) 
  \$wgScriptPath = \"{$this->values['wgScriptPath']}\";
  ${serverSetting}
  
 -## The relative URL path to the logo.  Make sure you change this from the default,
 +## The URL path to static resources (images, scripts, etc.)
 +\$wgResourceBasePath = \$wgScriptPath;
 +
 +## The URL path to the logo.  Make sure you change this from the default,
  ## or else you'll overwrite your logo when you upgrade!
  \$wgLogo = \"{$this->values['wgLogo']}\";