(cherry picked from commit 5cdcc1679f2eb8a79586bf407d4d2f6fc60c2c49) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt
(cherry picked from commit 5cdcc1679f2eb8a79586bf407d4d2f6fc60c2c49) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt