Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Properly fix merge conflict from #1663
  • Loading branch information
Slayer95 committed Mar 25, 2015
1 parent c9f7f54 commit 83ffa44
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions sockets.js
Expand Up @@ -114,6 +114,7 @@ if (cluster.isMaster) {
} else {
// is worker

if (process.env.PSPORT) Config.port = +process.env.PSPORT;
if (process.env.PSBINDADDR) Config.bindaddress = process.env.PSBINDADDR;
if (+process.env.PSNOSSL) Config.ssl = null;

Expand Down

0 comments on commit 83ffa44

Please sign in to comment.