版本更新

src/manifest.json

@@ -2,11 +2,7 @@
   "package": "com.beidao.kuaiying.haitian",
   "name": "海天阅读",
   "versionName": "1.0.10",
-<<<<<<< HEAD
-  "versionCode": 11,
-=======
   "versionCode": 10,
->>>>>>> ae4d4b1c842704f222f82473e045d4cded5157e6
   "minPlatformVersion": 1070,
   "icon": "/assets/imgs/logo.png",
   "features": [