解决合并冲突

hzj

2 天以前 82954f31a43d8f6c2c76b24bf09fd45502c24638

1
2
3
4
5
6
7
8
{
"versionCode":5,
"versionName":"1.52",
"url":"http://app.v.com.cn/app/vclub1.3.apk",
"note":"ÓÅ»¯Á˲¿·ÖUI",
"md5":"54c1433958136ca618cdc492ea9c001e",
"size":7881389
}