# Conflicts:
#	CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt
#	CommonLib/Common/src/main/res/layout/layout_common_toolbar.xml
#	CommonLib/Common/src/main/res/values/colors.xml
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt
#	Components/newscontent/src/main/res/layout/activity_system_setting.xml
#	app/src/main/java/com/shenghuoquan/business/YdSubwayApplication.kt
#	config/config.gradle