xulihua 5 anni fa
parent
commit
88e731e7b9
1 ha cambiato i file con 1 aggiunte e 4 eliminazioni
  1. 1 4
      app.json

+ 1 - 4
app.json

@@ -6,11 +6,8 @@
     "pages/drop/drop",
     "pages/me/me",
     "pages/details/details",
-<<<<<<< HEAD
-    "pages/next/next"
-=======
+    "pages/next/next",
     "pages/news/news"
->>>>>>> 495cb808c71f17eaa62085e8ac4d80f78ce5fc62
   ],
   "window": {
     "backgroundTextStyle": "light",