1

app.json

@@ -1,10 +1,7 @@
 {
     "pages": [
-<<<<<<< HEAD
   
 
-=======
->>>>>>> 7ec4ed57455da6bfdbdd262a20ff19c5b371c106
         "pages/index/index",
         "pages/register/index",
         "pages/home/index",
@@ -29,15 +26,10 @@
         
         "pages/matchInfo/index",
         "pages/matchInfo/sign",
-<<<<<<< HEAD
       
         "pages/order/index",
-        
-        "pages/test/index"
-=======
         "pages/test/index",
         "pages/usermyorder/index"
->>>>>>> 7ec4ed57455da6bfdbdd262a20ff19c5b371c106
     ],
     "usingComponents": {
         "van-sidebar": "@vant/weapp/sidebar/index",