# Conflicts:
#	MyDemo3/app/src/main/AndroidManifest.xml
#	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/adapter/MediaAdapter.kt
#	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/adapter/SimilarBeanAdapter.kt
#	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/base/BaseActivity.kt
#	MyDemo3/app/src/main/java/com/xm/test/myfilemaster/util/MediaUtil.kt