# Conflicts:
#	app/src/main/AndroidManifest.xml
#	gradle.properties
#	library_base/src/main/AndroidManifest.xml
#	mvvmhabit/src/main/AndroidManifest.xml
#	settings.gradle