merge

bcgov · Feb 12, 2020 · b91c36a · b91c36a
1 parent 28b3a2b
commit b91c36a
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/frontend/server/app.js b/frontend/server/app.js
@@ -59,11 +59,7 @@ if (process.env.NODE_ENV !== 'test') {
     }),
   });
   app.use(logger);
-<<<<<<< HEAD
-  app.use(morgan('dev'));
-=======
   app.use(morgan(morganLogLevel));
->>>>>>> 796e183d87d1bd4ff424b5ca4cee2991311977ba
 }
 
 if (isDevelopment) {
@@ -80,12 +76,6 @@ if (isDevelopment) {
   app.use(webpackHotMiddleware(compiler));
 }
 
-<<<<<<< HEAD
-log.level = 'debug'; // config.get('logLevel');
-log.addLevel('debug', 2900, { fg: 'green' });
-
-=======
->>>>>>> 796e183d87d1bd4ff424b5ca4cee2991311977ba
 // Express config
 app.set('view engine', 'pug');
 app.set('views', `${__dirname}/views`);