# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java # app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
