(cherry picked from commit 9e3b454b1b79a7725b3d3be4c85c1655ad80e18d) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt
(cherry picked from commit 9e3b454b1b79a7725b3d3be4c85c1655ad80e18d) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/queries/MangaCategoryQueries.kt