# Conflicts: # main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java # public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java # public-base/src/main/res/values/attrs.xml
