Fix merge conflict

2019-05-13 16:33:30 -04:00
parent d4ac228efd
commit 9eb322ec87
1 changed files with 1 additions and 1 deletions
--- a/server.ts
+++ b/server.ts
@@ -14,7 +14,7 @@ export let pws = process.env.PWS || "none";
 export const app = express();

 if ( !process.env.HOST || !process.env.PORT || !process.env.LOCAL_PWS ) {
-	dotenv.load();
+	dotenv.config();
 	host = process.env.HOST || host;
 	port = parseInt( process.env.PORT ) || port;
 	pws = process.env.PWS || pws;