# Conflicts: # app/src/main/java/com/nuvio/tv/updater/ui/UpdatePromptDialog.kt # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| libs | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-rules.pro | ||
# Conflicts: # app/src/main/java/com/nuvio/tv/updater/ui/UpdatePromptDialog.kt # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| libs | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-rules.pro | ||