Home Explore Help
Register Sign In
gyfl
/
minixyz
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

updata

huanggang 7 years ago
parent
4c190b4d0e
commit
4d67b76b42
1 changed files with 0 additions and 5 deletions
Split View Show Diff Stats
  1. 0 5
      project.config.json

+ 0 - 5
project.config.json
View File 

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