@@ -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",