Resolving merge conflicts

redbox-mint · Feb 2, 2021 · 4c4270e · 4c4270e
1 parent 9cac48a
commit 4c4270e
Show file tree

Hide file tree

Showing 6 changed files with 877 additions and 1,157 deletions.
diff --git a/.gitignore b/.gitignore
@@ -172,5 +172,5 @@ api/controllers/**/*.js
 typescript/api/controllers/**/*.js
 typescript/api/services/**/*.js
 assets/angular
-api/core/*.js
+api/core/**/*.js
 dev
diff --git a/config/session.js b/config/session.js
@@ -73,9 +73,9 @@ module.exports.session = {
   * Use the latest version with Node >= 4.0                                  *
   *                                                                          *
   ***************************************************************************/
-
-  adapter: 'mongo',
-  url: 'mongodb://mongodb:27017/sessions', // user, password and port optional
+  // TODO: Reinstate mongo as default
+  // adapter: 'mongo',
+  // url: 'mongodb://mongodb:27017/sessions', // user, password and port optional
 
   /***************************************************************************
   *                                                                          *