Conflicts:
	.gitmodules
	CHANGELOG.md
	edit.html
	import.js
	lang/zh-cn/zh-cn.js
	src/core/kityminder.js
	src/protocol/png.js
	ui/contextmenu.js
	ui/menu/share/share.js
	ui/ribbon/idea/image.js
	ui/ribbon/view/level.js
	ui/theme/default/css/_icons.less
	ui/theme/default/css/_kityminder.less
	ui/theme/default/css/_mainmenu.less
	ui/theme/default/css/_notice.less
	ui/theme/default/css/_resource_panel.less
	ui/theme/default/css/_tab.less
	ui/theme/default/css/_widgets.less
	ui/theme/default/css/import.less
	ui/theme/default/images/icons.png
	ui/topbar/search.js
	ui/ui.js

Conflicts:
	lib/kity

Conflicts:
	lang/zh-cn/zh-cn.js
	ui/theme/default/css/default.all.css
	ui/theme/default/css/default.all.css.map