gdpr

2023-04-21 14:59:10 +02:00
parent 57d7d66533
commit f872286440
3 changed files with 19 additions and 19 deletions
--- a/package.json
+++ b/package.json
@@ -5,16 +5,13 @@
  "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
  "author": "daniel.hutzel@sap.com",
  "dependencies": {
-<<<<<<< HEAD
    "@capire/bookshop": "./bookshop",
    "@capire/common": "./common",
    "@capire/fiori": "./fiori",
    "@capire/media": "./media",
    "@capire/orders": "./orders",
-    "@capire/reviews": "./reviews"
-=======
+    "@capire/reviews": "./reviews",
    "@sap/cds": ">=5.5.3"
->>>>>>> 534af7ffee60e086c563dbaa450e86e5fca5cf2b
  },
  "workspaces": [
    "./bookshop",