-
# Conflicts: # apps/product/controllers/detail.js # apps/product/index.js # apps/product/router.js # public/scss/index.css # public/vue/product/css/detail.css # public/vue/product/css/show-box.css # public/vue/product/detail.vue # public/vue/product/image-carousel.vue # public/vue/product/js/detail.js
