# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
