
(cherry picked from commit ad3d915fc56ecb8328861fdc2bf9e5f5c2aadbe3) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt
(cherry picked from commit ad3d915fc56ecb8328861fdc2bf9e5f5c2aadbe3) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt