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