# Conflicts:
#	CHANGELOG.en-US.md
#	CHANGELOG.zh-CN.md
#	examples/app.vue
#	examples/index.tpl
#	examples/versions.json
#	package.json
#	packages/dropdown/src/dropdown.vue
#	packages/theme-default/package.json
#	packages/theme-default/src/date-picker/date-picker.css
#	src/index.js