merge master

2017-11-05 21:00:05 +01:00 · 2017-11-05 21:00:05 +01:00 · c485e7e167
parent 71a8361580
commit c485e7e167
1 changed files with 0 additions and 5 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -8,13 +8,8 @@ android {
        applicationId "org.schabi.newpipe"
        minSdkVersion 15
        targetSdkVersion 26
-<<<<<<< HEAD
-        versionCode 40
-        versionName "0.10.2"
-=======
        versionCode 41
        versionName "0.11.0"
->>>>>>> dev

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true