# Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt |
||
|---|---|---|
| .. | ||
| config.yml | ||
| report_issue.yml | ||
| request_feature.yml | ||
# Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt |
||
|---|---|---|
| .. | ||
| config.yml | ||
| report_issue.yml | ||
| request_feature.yml | ||