# Conflicts: # common/styles/iconfont.css # pages/discover/discover.vue # pages/discover/discoverdetails.vue