From 63b89b693d4d5c30abe71a2b9a87a80572a4d20f Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 24 Jul 2014 12:06:52 +0200 Subject: [PATCH] Update Settings.js added brackets to match etherpad lite devs' coding style --- src/node/utils/Settings.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index f3005033..c455617b 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -178,11 +178,12 @@ exports.reloadSettings = function reloadSettings() { // Discover where the settings file lives var settingsFilename = argv.settings || "settings.json"; - if (path.resolve(settingsFilename)===settingsFilename) + if (path.resolve(settingsFilename)===settingsFilename) { settingsFilename = path.resolve(settingsFilename); - else + } else { settingsFilename = path.resolve(path.join(exports.root, settingsFilename)); - + } + var settingsStr; try{ //read the settings sync