Manually resolved merge conflicts from https://hosted.weblate.org/git/tachiyomi/strings/ (cherry picked from commit f3c50ee9a36c0bb7b047cf36b47ac6fdda509840) |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi/util/chapter | ||
Manually resolved merge conflicts from https://hosted.weblate.org/git/tachiyomi/strings/ (cherry picked from commit f3c50ee9a36c0bb7b047cf36b47ac6fdda509840) |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi/util/chapter | ||