fix confilct

@@ -10,11 +10,7 @@ import storeHome from './home';
 
 
 import storeAddress from './address';
 import storeAddress from './address';
 import storeNotice from './notice';
 import storeNotice from './notice';
-<<<<<<< HEAD
-import storeHome from './home';
 
 
-=======
->>>>>>> 282eb0ac279340a4ce46f4b8bd09a93f37085580
 Vue.use(Vuex);
 Vue.use(Vuex);
 
 
 export function createStore(context) {
 export function createStore(context) {
@@ -30,14 +26,9 @@ export function createStore(context) {
       address: storeAddress(),
       address: storeAddress(),
 
 
       // 买家订单列表
       // 买家订单列表
-      // buyerOderList: buyerOderList(),
-
       notice: storeNotice(),
       notice: storeNotice(),
-<<<<<<< HEAD
       buyerOderList: buyerOderList(),
       buyerOderList: buyerOderList(),
-=======
 
 
->>>>>>> 282eb0ac279340a4ce46f4b8bd09a93f37085580
     },
     },
 
 
     strict: process.env.NODE_ENV !== 'production',
     strict: process.env.NODE_ENV !== 'production',