(cherry picked from commit ca065169002475cc92b7736d02340127a5e419bd) # Conflicts: # app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt
(cherry picked from commit ca065169002475cc92b7736d02340127a5e419bd) # Conflicts: # app/src/main/java/eu/kanade/data/manga/MangaRepositoryImpl.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadCache.kt