# Conflicts: # src/main.js # src/router/index.js
# Conflicts: # src/components/swiperItem/swiperItem.less