# Conflicts: # static/icon/ic_fenxiang@2x.png # static/icon/ic_jifen_zuo@2x.png # static/icon/ic_wz_dianzan2@2x.png # static/icon/ic_wz_dianzan3@2x.png # static/icon/ic_wz_guanzhu2@2x.png # static/icon/ic_wz_guanzhu3@2x.png # static/tabbar/ic_shouye1@2x.png # static/tabbar/ic_shouye2@2x.png # static/tabbar/ic_shuishoupai1@2x.png # static/tabbar/ic_shuishoupai2@2x.png # static/tabbar/ic_sspsj1@2x.png # static/tabbar/ic_sspsj2@2x.png # static/tabbar/ic_wode1@2x.png # static/tabbar/ic_wode2@2x.png