# Conflicts: # app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java # app/src/main/res/values/styles.xml
