remove local merge error

packages/rocketchat-lib/server/startup/settings.coffee

@@ -233,7 +233,7 @@ RocketChat.settings.addGroup 'Layout', ->
 		@add 'Layout_Terms_of_Service', 'Terms of Service <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'code', code: 'text/html', multiline: true, public: true }
 		@add 'Layout_Login_Terms', 'By proceeding you are agreeing to our <a href="/terms-of-service">Terms of Service</a> and <a href="/privacy-policy">Privacy Policy</a>.', { type: 'string', multiline: true, public: true }
 		@add 'Layout_Privacy_Policy', 'Privacy Policy <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'code', code: 'text/html', multiline: true, public: true }
-		@add 'Layout_Sidenav_Footer', '<img style="left: 10px; position: absolute;" src="'+(__meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '')+'/assets/logo.png" />', { type: 'code', code: 'text/html', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
+		@add 'Layout_Sidenav_Footer', '<img style="left: 10px; position: absolute;" src="/assets/logo.png" />', { type: 'code', code: 'text/html', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
 
 	@section 'Custom Scripts', ->
 		@add 'Custom_Script_Logged_Out', '//Add your script', { type: 'code', multiline: true, public: true }

server/startup/migrations/v065.js

-RocketChat.Migrations.add({
-	version: 65,
-	up: function() {
-		RocketChat.models.Settings.update({ _id: 'Layout_Sidenav_Footer' }, {
-			$set: {
-				value: '<img style="left: 10px; position: absolute;" src="'+(__meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '')+'/assets/logo.png" />'
-			}
-		});
-	}
-});