"Enable CF Merge branch 'OpenSAP-week3-unit5' of https://github.com/SAP-samples/cloud-cap-samples into OpenSAP-week3-unit5

package.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "name": "@sap/capire-samples",
   "description": "The umbrella project for all samples to easily setup for local development and tests.",
   "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
@@ -26,4 +27,46 @@
     "jest": "*"
   },
   "license": "SAP SAMPLE CODE LICENSE"
+=======
+    "name": "@sap/capire-samples",
+    "description": "The umbrella project for all samples to easily setup for local development and tests.",
+    "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
+    "author": "daniel.hutzel@sap.com",
+    "private": true,
+    "scripts": {
+        "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
+        "install": "(npm -s run lerna) && lerna bootstrap --hoist",
+        "cleanup": "lerna clean -y && rm -fr node_modules",
+        "bookshop": "cds watch packages/bookshop",
+        "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
+        "reviews-service": "cds watch packages/reviews-service",
+        "bookstore": "cds watch packages/bookstore",
+        "media-server": "cds watch packages/media-server"
+    },
+    "dependencies": {
+        "@sap/cds": "latest",
+        "express": "*",
+        "passport": "^0.4.1",
+        "hdb": "^0.17.1"
+    },
+    "devDependencies": {
+        "sqlite3": "*"
+    },
+    "--add-these-to-devDependencies-for-tests": {
+        "@types/jest": "*",
+        "jest": "*"
+    },
+    "license": "SAP SAMPLE CODE LICENSE",
+    "cds": {
+        "requires": {
+            "db": {
+                "kind": "hana",
+                "model": "srv"
+            },
+            "uaa": {
+                "kind": "xsuaa"
+             }
+        }
+    }
+>>>>>>> cad3a32c78620f4c4558fad34991dd48866af8d3
 }