From 44cf2813608f64f3c5123afd48cfa72b63745b41 Mon Sep 17 00:00:00 2001
From: pianocktail <matthias.buehl@sap.com>
Date: Thu, 6 Feb 2020 09:00:34 +0000
Subject: [PATCH] package.json

---
 packages/bookshop/package.json | 36 ----------------------------------
 1 file changed, 36 deletions(-)

diff --git a/packages/bookshop/package.json b/packages/bookshop/package.json
index d7a78366..0946784e 100644
--- a/packages/bookshop/package.json
+++ b/packages/bookshop/package.json
@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
     "name": "@sap/capire-bookshop",
     "version": "1.0.0",
     "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
@@ -28,39 +27,4 @@
             }
         }
     }
-=======
-  "name": "@sap/capire-bookshop",
-  "version": "1.0.0",
-  "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
-  "license": "SAP SAMPLE CODE LICENSE",
-  "dependencies": {
-    "@sap/cds": "latest",
-    "express": "*",
-    "passport": "^0.4.1"
-  },
-     "cds": {
-      "auth": {
-        "passport": {
-          "strategy": "mock",
-          "users": {
-            "alice": {
-                "password": "123",
-                "ID": "alice",
-                "roles": ["admin", "authenticated-user"],
-                "xs.user.attributes": { "currency":  [ "USD" ] }
-            },
-            "bob": {
-                "password": "123",
-                "ID": "bob",
-                "roles": ["authenticated-user"]
-            }
-          }
-        }
-      }
-    },    
-  "scripts": {
-    "start": "cds run --in-memory?",
-    "watch": "cds watch"
-  }
->>>>>>> cad3a32c78620f4c4558fad34991dd48866af8d3
 }