resolve conflicts

medusajs · Jan 18, 2024 · c134882 · c134882
2 parents 1ebc0bb + 7f7cb2a
commit c134882
Show file tree

Hide file tree

Showing 40 changed files with 1,581 additions and 613 deletions.
diff --git a/.changeset/olive-ads-brake.md b/.changeset/olive-ads-brake.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/types": patch
+---
+
+feat(cart): Shipping methods