Skip to content

Commit

Permalink
Solve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
bc-tgomez committed Jan 8, 2024
1 parent 2c3656c commit a159a17
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions reference/checkouts.v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1608,14 +1608,10 @@ paths:
This discount only applies to `line_items`. When you call this API, you clear out all existing discounts applied to line items, including product and order-based discounts.
<<<<<<< HEAD
This endpoint splits the discount between line items based on the item value.
=======
**Note:**
This endpoint splits the discount between line items based on the item value.
You'll get an error message if you try adding a manual line item discount on a cart with a promotion or coupon applied. The same limitations apply if you try adding a coupon or promotion to a cart with an existing manual line item discount.
>>>>>>> 07c51731 (Update reference/checkouts.v3.yml)
Required Fields
* discounted_amount
Expand Down

0 comments on commit a159a17

Please sign in to comment.