From 9eb322ec873049d08e89742433fa8397ab26d6a1 Mon Sep 17 00:00:00 2001
From: Matthew Oslan <derpthemeus@gmail.com>
Date: Mon, 13 May 2019 16:33:30 -0400
Subject: [PATCH] Fix merge conflict

---
 server.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.ts b/server.ts
index fb4ccd2..deaa1c0 100644
--- 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;