# Conflicts: # base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionManager.java # base-module/src/main/res/values/ids.xml # login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/presenter/BaseLoginPresenter.java
