# Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java # shopping-cart-application-service/src/test/java/cn.freemud/service/CartTest.java # shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java
