# Conflicts:
#	.idea/modules.xml
#	app/src/main/java/com/xingdata/zzdpos/ui/manage/manageMenu/ManageMenuActivity.java