-
Conflicts: mobile/index.js mobile/package.json mobile/public/fonts/iconfont.eot mobile/public/fonts/iconfont.svg mobile/public/fonts/iconfont.ttf mobile/public/fonts/iconfont.woff mobile/public/js/data.js mobile/router.js
Conflicts: mobile/index.js mobile/package.json mobile/public/fonts/iconfont.eot mobile/public/fonts/iconfont.svg mobile/public/fonts/iconfont.ttf mobile/public/fonts/iconfont.woff mobile/public/js/data.js mobile/router.js