ppetru/opensprinkler-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Matthew Oslan
2019-05-13 16:33:30 -04:00
parent d4ac228efd
commit 9eb322ec87
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server.ts
View File

@@ -14,7 +14,7 @@ export let pws = process.env.PWS || "none";
export const app = express(); export const app = express();
if ( !process.env.HOST || !process.env.PORT || !process.env.LOCAL_PWS ) { if ( !process.env.HOST || !process.env.PORT || !process.env.LOCAL_PWS ) {
dotenv.load(); dotenv.config();
host = process.env.HOST || host; host = process.env.HOST || host;
port = parseInt( process.env.PORT ) || port; port = parseInt( process.env.PORT ) || port;
pws = process.env.PWS || pws; pws = process.env.PWS || pws;