Fixed merge conflicts

Gruntfile.js

@@ -56,7 +56,7 @@ module.exports = function GruntConfig(grunt) {
         mochaOptions: ['--exit']
       },
       coverage: {
-        src: 'test/*.spec.js',
+        src: 'test/test.js',
         options: {
           timeout: 60000,
           check: {

package.json

@@ -1,14 +1,14 @@
 {
   "name": "oe-component-passport",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "oe-cloud modularization project",
   "engines": {
     "node": ">=6"
   },
   "main": "index.js",
   "scripts": {
     "pretest": "npm install --no-optional",
-    "test": "mocha --no-timeouts test/*.spec.js",
+    "test": "mocha --no-timeouts test/test.js",
     "lint": "eslint .",
     "fix-lint": "eslint --fix .",
     "grunt-cover": "grunt test-with-coverage"
@@ -18,7 +18,7 @@
     "cookie-parser": "1.4.3",
     "jsonwebtoken": "8.4.0",
     "loopback-component-passport": "3.10.0",
-    "oe-jwt-utils": "2.0.0",
+    "oe-jwt-utils": "^2.0.0",
     "passport": "0.4.0",
     "passport-facebook": "3.0.0",
     "passport-google-oauth": "1.0.0",
@@ -35,7 +35,7 @@
     "chai-things": "0.2.0",
     "chalk": "1.1.1",
     "eslint": "4.10.0",
-    "grunt": "1.0.3",
+    "grunt": "1.0.4",
     "grunt-banner": "0.6.0",
     "grunt-cli": "1.3.2",
     "grunt-contrib-clean": "2.0.0",
@@ -48,7 +48,8 @@
     "mocha": "5.2.0",
     "superagent-defaults": "0.1.14",
     "supertest": "3.4.2",
-    "oe-cloud": "2.0.0"
+    "loopback-connector-mongodb": "3.9.2",
+    "oe-cloud": "^2.0.0"
   },
   "author": "Dipayan Aich <[email protected]>",
   "repository": {

test/component-config.json

@@ -1,5 +1,2 @@
 {
-  "loopback-component-explorer": {
-    "mountPath": "/explorer"
-  }
 }