# Conflicts:
#	app/src/main/java/com/bonait/bnframework/ui/fragment/goods/LocalGoodsFragment.java
#	app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateDataService.java
#	app/src/main/java/com/bonait/bnframework/ui/widget/WaitProcessUtil.java

# Conflicts:
#	app/src/main/res/layout/fragment_cloud_goods.xml
#	app/src/main/res/layout/fragment_home_foods.xml

# Conflicts:
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingSimulatedActivity.java
#	app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/systeminternetfragment.java

# Conflicts:
#	app/src/main/java/com/bonait/bnframework/business/UpDataModel.java
#	app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigation2Activity.java