(cherry picked from commit da8669c826e6575a76751842bda3da59dc2f07c7) (cherry picked from commit 4b7b710b7cc2e3526de176eb0eb72d763b32bcd7) # Conflicts: # app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt
(cherry picked from commit da8669c826e6575a76751842bda3da59dc2f07c7) (cherry picked from commit 4b7b710b7cc2e3526de176eb0eb72d763b32bcd7) # Conflicts: # app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt