Move to standard README and package-lock file

2020-03-24 11:17:23 +01:00
parent 23cc571d8a
commit 2bf65fb50f
6 changed files with 919 additions and 56 deletions
--- a/packages/bookshop/srv/admin-service.cds
+++ b/packages/bookshop/srv/admin-service.cds
@@ -14,10 +14,6 @@ annotate AdminService.Orders with @odata.draft.enabled;
 extend service AdminService with {
  entity OrderItems as select from my.OrderItems;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> cad3a32c78620f4c4558fad34991dd48866af8d3
 // Restrict access to orders to users with role "admin"
 annotate AdminService.Orders with  @(restrict: [
   { grant: 'READ', to: 'admin' }