# Conflicts:
#	app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java
#	app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java
#	app/src/main/java/com/bonait/bnframework/modules/home/adapter/sp_adapter.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyActivity.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyUpdateActivity.java
#	app/src/main/res/layout/activity_diy_update.xml