# Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| readme-images | ||
| workflows | ||
| FUNDING.yml | ||
| ISSUE_TEMPLATE.md | ||
| pull_request_template.md | ||
# Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| readme-images | ||
| workflows | ||
| FUNDING.yml | ||
| ISSUE_TEMPLATE.md | ||
| pull_request_template.md | ||