@@ -1,12 +1,7 @@
{
"name" : "智慧停车",
-<<<<<<< HEAD
"appid" : "__UNI__BF6D66C",
"description" : "普定停车二期",
-=======
- "appid" : "__UNI__0BC09F6",
- "description" : "",
->>>>>>> 07f09249460eec563758cac7bb46b8f75d1c02f2
"versionName" : "1.5.0",
"versionCode" : "100",
"transformPx" : false,
