# Conflicts:
#	arms/build.gradle
#	base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
#	config.gradle
#	print-module/src/main/java/com/joe/print/mvp/print/PrintTest.java