Fixed merge conflicts

EdgeVerve · Nov 14, 2019 · 417d04c · 417d04c
2 parents 429afce + b31f339
commit 417d04c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oe-datasource-personalization",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "oe-cloud modularization project aka oecloud.io",
   "engines": {
     "node": ">=6"
@@ -14,7 +14,7 @@
     "grunt-cover": "grunt test-with-coverage"
   },
   "dependencies": {
-    "lodash": "4.17.11"
+    "lodash": "4.17.14"
   },
   "devDependencies": {
     "babel-eslint": "7.2.3",
@@ -23,7 +23,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",
@@ -37,9 +37,9 @@
     "superagent-defaults": "0.1.14",
     "supertest": "3.4.2",
     "loopback-connector-mongodb": "3.9.2",
-    "oe-cloud": "2.0.0",
-    "oe-connector-postgresql": "2.0.0",
-    "oe-multi-tenancy": "2.0.0"
+    "oe-cloud": "^2.0.0",
+    "oe-connector-postgresql": "^2.0.0",
+    "oe-multi-tenancy": "^2.0.0"
   },
   "repository": {
     "type": "git",

diff --git a/test/component-config.json b/test/component-config.json
@@ -1,5 +1,2 @@
 {
-  "loopback-component-explorer": {
-    "mountPath": "/explorer"
-  }
 }