Skip to content

Commit

Permalink
fix(settings): Identifier 'exports' has already been declared
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveVanOpstal committed Feb 27, 2017
1 parent 312a80d commit fda90c3
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions config/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ try {
} catch (e) {
}

let exports = helpers.merge(settings, {
module.exports['settings'] = helpers.merge(settings, {
httpServer: {host: 'localhost', port: 8080},
staticServer: {host: 'localhost', port: 8081},
matchServer: {host: 'localhost', port: 8082, sampleSize: 32},
Expand All @@ -16,8 +16,5 @@ let exports = helpers.merge(settings, {
'match': 'v2.2',
'static-data': 'v1.2',
},
gameTime: 60 * 60 * 1000
})

exports['settings'] = exports;
module.exports = exports
gameTime: 45 * 60 * 1000
});

0 comments on commit fda90c3

Please sign in to comment.