解决冲突

season
2 parents 14b67613 875625f3
Showing 1 changed file with 4 additions and 0 deletions
app.json
@@ -54,7 +54,11 @@
     "pages/payment/pay_success/pay_success",
     "pages/user/plus/plus",
     "pages/user/cardinfo/cardinfo",
+<<<<<<< HEAD
     "pages/user/Detailed/Detailed",
+=======
+    "pages/user/Detailed/Detailed",   
+>>>>>>> 875625f38c1972869416e1894a992442d54ae75a
     "pages/user/my_service/appment_main",
     "pages/user/my_service/i_service",
     "pages/user/my_service/cosmetology_list",