Fixed merge conflict

Co-authored-by: Mohammed Anas <triallax@tutanota.com>
This commit is contained in:
litetex 2022-02-03 21:06:25 +01:00 committed by GitHub
parent 91bcd8766a
commit b0e4f947ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -14,8 +14,8 @@ android {
defaultConfig { defaultConfig {
applicationId "org.schabi.newpipe" applicationId "org.schabi.newpipe"
resValue "string", "app_name", "NewPipe" resValue "string", "app_name", "NewPipe"
minSdkVersion 19 minSdk 19
targetSdkVersion 29 targetSdk 29
versionCode 982 versionCode 982
versionName "0.21.16" versionName "0.21.16"