mindol1004/ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI Modify

Browse Source
This commit is contained in:
lee-soo-heon
2019-09-10 17:58:23 +09:00
parent 4da33434ed
commit 63e6a723bb
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/products/ProductRepository.vue
View File

@@ -1,9 +1,5 @@
<template>
<<<<<<< HEAD
<v-container>
=======
<v-container style="padding: 0px">
>>>>>>> a8d0ff06c77a4b51b4c896c8333775d3ca27446f
<v-card
color="amber"
>

8
src/main.js
View File

@@ -46,20 +46,12 @@ Vue.component('OrderFinish',OrderFinish);
Vue.component('OrderPage', OrderPage)
Vue.component('Survey',Survey);
Vue.component('SurveyForm',SurveyForm);
<<<<<<< HEAD
Vue.component('UserInfo', UserInfo);
Vue.component('DeliveryStatus', DeliveryStatus);
Vue.component('ProductSimple', ProductSimple);
Vue.component('ProductRepository',ProductRepository);
Vue.component('ProductDelete',ProductDelete);
=======
Vue.component('UserInfo', UserInfo)
Vue.component('DeliveryStatus', DeliveryStatus)
Vue.component('Product',Product)
Vue.component('ProductSimple', ProductSimple)
Vue.component('ProductRepository',ProductRepository)
Vue.component('ProductDelete',ProductDelete)
>>>>>>> a8d0ff06c77a4b51b4c896c8333775d3ca27446f
Vue.config.productionTip = false