# Conflicts: # app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt # app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java # app/src/main/java/org/schabi/newpipe/player/Player.java # app/src/main/res/values-eu/strings.xml # gradle/libs.versions.toml