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

packages/bookshop/package-lock.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "name": "@sap/capire-bookshop",
   "version": "1.0.0",
   "lockfileVersion": 1,
@@ -980,3 +981,31 @@
     }
   }
 }
+=======
+    "name": "@sap/capire-bookshop",
+    "version": "1.0.0",
+    "lockfileVersion": 1,
+    "requires": true,
+    "dependencies": {
+      "passport": {
+        "version": "0.4.1",
+        "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz",
+        "integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==",
+        "requires": {
+          "passport-strategy": "1.x.x",
+          "pause": "0.0.1"
+        }
+      },
+      "passport-strategy": {
+        "version": "1.0.0",
+        "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+        "integrity": "sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ="
+      },
+      "pause": {
+        "version": "0.0.1",
+        "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+        "integrity": "sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10="
+      }
+    }
+  }
+>>>>>>> cad3a32c78620f4c4558fad34991dd48866af8d3