# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java
#	app/src/main/res/layout/title.xml