# Conflicts:
#	CommonLib/Common/src/main/java/com/yidian/common/base/BaseActivity.kt
#	app/build.gradle
#	app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt
#	config/config.gradle