# Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/settings/SettingMigrations.java # app/src/main/res/values/strings.xml
# Conflicts: # app/build.gradle # app/src/main/java/org/schabi/newpipe/settings/SettingMigrations.java # app/src/main/res/values/strings.xml