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