# Conflicts:
#	app/src/main/java/com/zxhy/fastfilemanagerpro/CommonViewModel.kt
#	app/src/main/java/com/zxhy/fastfilemanagerpro/gridfile/KoGridFilekoActivity.kt
#	app/src/main/java/com/zxhy/fastfilemanagerpro/kokodata/KoFileDatako.kt
#	app/src/main/java/com/zxhy/fastfilemanagerpro/kokolistfile/KoListFilekoActivity.kt
#	app/src/main/java/com/zxhy/fastfilemanagerpro/kokomanager/KoManagerkoFragment.kt
#	app/src/main/java/com/zxhy/fastfilemanagerpro/kokotools/GlideHelper.kt
#	app/src/main/res/layout/activity_ko_grid_fileko.xml
#	app/src/main/res/layout/item_koko_grid_file.xml
#	app/src/main/res/navigation/nav.xml

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/zxhy/fastfilemanagerpro/MainActivity.kt
#	app/src/main/res/layout/activity_ko_list_fileko.xml

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/zxhy/fastfilemanagerpro/KokoLaunchActivity.kt
#	app/src/main/java/com/zxhy/fastfilemanagerpro/MainActivity.kt
#	app/src/main/res/layout/activity_ko_list_fileko.xml
#	app/src/main/res/mipmap-hdpi/d_5563322.png
#	app/src/main/res/mipmap-hdpi/fgf_87979812.png
#	app/src/main/res/mipmap-xxhdpi/d_5563322.png
#	app/src/main/res/mipmap-xxhdpi/fgf_87979812.png
#	gradle/wrapper/gradle-wrapper.properties