|
@@ -1,22 +1,12 @@
|
|
{
|
|
{
|
|
"pages": [
|
|
"pages": [
|
|
-<<<<<<< HEAD
|
|
|
|
-=======
|
|
|
|
- "pages/reserve/index",
|
|
|
|
- "pages/history/index",
|
|
|
|
- "pages/my/index",
|
|
|
|
- "pages/login/index",
|
|
|
|
->>>>>>> 83c4bf5848aa11a939b5a6bda8ac775e89148c67
|
|
|
|
"pages/home/index",
|
|
"pages/home/index",
|
|
"pages/login/index",
|
|
"pages/login/index",
|
|
"pages/food/index",
|
|
"pages/food/index",
|
|
"pages/calorie/index",
|
|
"pages/calorie/index",
|
|
-<<<<<<< HEAD
|
|
|
|
"pages/reserve/index",
|
|
"pages/reserve/index",
|
|
"pages/my/index",
|
|
"pages/my/index",
|
|
"pages/history/index",
|
|
"pages/history/index",
|
|
-=======
|
|
|
|
->>>>>>> 83c4bf5848aa11a939b5a6bda8ac775e89148c67
|
|
|
|
"pages/news/index",
|
|
"pages/news/index",
|
|
"pages/news/detail"
|
|
"pages/news/detail"
|
|
],
|
|
],
|
|
@@ -94,4 +84,4 @@
|
|
"navigationStyle": "custom"
|
|
"navigationStyle": "custom"
|
|
},
|
|
},
|
|
"sitemapLocation": "sitemap.json"
|
|
"sitemapLocation": "sitemap.json"
|
|
-}
|
|
|
|
|
|
+}
|