@@ -64,13 +64,8 @@
},
{
"id": -1,
-<<<<<<< HEAD
"name": "fcode",
"pathName": "pages/fcode/fcode",
-=======
- "name": "addAddress",
- "pathName": "pages/addAddress/addAddress",
->>>>>>> 014e79f25d92b3c369999408c361a8d43fec90d4
"query": ""
}
]
