fix: merge conflicts with master

2022-04-27 14:21:03 +02:00
parent 00fd096d25 d162cef4c8
commit d7971ba604
69 changed files with 8240 additions and 3476 deletions
--- a/docs/api/store-spec3.json
+++ b/docs/api/store-spec3.json
@@ -1512,7 +1512,7 @@
    "/store/carts/{id}": {
      "post": {
        "operationId": "PostCartsCartPaymentMethodUpdate",
-        "summary": "Update a Cart\"",
+        "summary": "Update a Cart",
        "description": "Updates a Cart.",
        "parameters": [
          {