aboutsummaryrefslogtreecommitdiff
path: root/src/server/index.ts
diff options
context:
space:
mode:
authoranika-ahluwalia <anika.ahluwalia@gmail.com>2020-05-17 12:40:46 -0500
committeranika-ahluwalia <anika.ahluwalia@gmail.com>2020-05-17 12:40:46 -0500
commit0b12ca7a6a999cf3a0b130567b4f1354e3ea785b (patch)
tree71dc4dded86bc13cdd5a7c13b379909f1af8ea0e /src/server/index.ts
parentba9d2324b4f2249bd8bc03ca81979577f4641d83 (diff)
adjusting parameters reduce
Diffstat (limited to 'src/server/index.ts')
-rw-r--r--src/server/index.ts9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/server/index.ts b/src/server/index.ts
index fd5552d12..7ac032ed3 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -149,18 +149,9 @@ export async function launchServer() {
* log the output of the server process, so it's not ideal for development.
* So, the 'else' clause is exactly what we've always run when executing npm start.
*/
-<<<<<<< HEAD
-if (process.env.RELEASE) {
- (sessionAgent = new DashSessionAgent()).launch();
-} else {
- setTimeout(() => (Database.Instance as Database.Database).doConnect(), 30000);
- launchServer();
-}
-=======
// if (process.env.RELEASE) {
// (sessionAgent = new DashSessionAgent()).launch();
// } else {
(Database.Instance as Database.Database).doConnect();
launchServer();
// }
->>>>>>> 9c3d461a9642a4596c55f642af2b55e186b0fe20