# Conflicts:
#	examples/app.vue
#	examples/docs/en-US/tree.md
#	examples/docs/zh-CN/tree.md
#	examples/versions.json
#	packages/select/src/select.vue
#	packages/theme-default/package.json