mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-20 12:09:45 +01:00
Fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
e5cb10e386
commit
6f62efe7ce
@ -38,13 +38,8 @@ android {
|
|||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
versionCode 107
|
versionCode 107
|
||||||
versionName "6.2.0"
|
versionName "6.2.0"
|
||||||
=======
|
|
||||||
versionCode 108
|
|
||||||
versionName "6.1.6"
|
|
||||||
>>>>>>> cde40d6e... Better cleanup
|
|
||||||
|
|
||||||
flavorDimensions "default"
|
flavorDimensions "default"
|
||||||
renderscriptTargetApi 19
|
renderscriptTargetApi 19
|
||||||
|
Loading…
Reference in New Issue
Block a user