# Conflicts: # component-login/src/main/AndroidManifest.xml # component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java # library-order/src/main/java/com/gingersoft/gsa/cloud/order/order/DoshokuOrder.java
