# Conflicts: # base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java # base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyGlobalHttpHandler.java # table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/BillItemAdapter.java
