# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java
#	app/src/main/res/layout/fragment_user_list.xml