zjh 5 years ago
parent
commit
2ee5b19407
1 changed files with 1 additions and 3 deletions
  1. 1 3
      app.json

+ 1 - 3
app.json

@@ -8,13 +8,11 @@
     "pages/details/details",
     "pages/next/next",
     "pages/news/news",
-<<<<<<< HEAD
     "pages/filter/filter",
     "pages/item/item"
-=======
     "pages/auth/auth",
     "pages/search/search"
->>>>>>> 15f5b8681680a916eb0b7a3f7428147f83b8558e
+
   ],
   "window": {
     "backgroundTextStyle": "light",