# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/xx/merchanthbh/data/http/ApiService.kt
#	app/src/main/java/com/xx/merchanthbh/data/http/requst/LogOffRequest.kt
#	app/src/main/java/com/xx/merchanthbh/data/http/requst/LoginRequest.kt
#	app/src/main/java/com/xx/merchanthbh/ui/login/LoginActivity.kt
#	app/src/main/java/com/xx/merchanthbh/ui/login/LoginViewModel.java
#	app/src/main/java/com/xx/merchanthbh/ui/logoff/LogOffActivity.java
#	app/src/main/java/com/xx/merchanthbh/ui/mine/MineViewModel.java
#	app/src/main/res/drawable/bg_forground_radius_no_24.xml
#	app/src/main/res/layout/activity_log_off.xml
#	app/src/main/res/layout/fragment_mine.xml
#	consumer/src/main/AndroidManifest.xml
#	consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java
#	hbhbcompany/src/main/java/com/xx/hbhbcompany/data/http/requst/LoginRequest.kt
#	hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginActivity.kt
#	hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/login/LoginViewModel.java
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseViewModel.java
#	mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/MaterialDialogUtils.java
#	xxviewlibrary/src/main/java/com/xx/xxviewlibrary/comm/CommTextAgreeDialog.kt
#	xxviewlibrary/src/main/res/layout/dialog_comm_text_agree.xml