From c485e7e167971eb82b8d5b10f5a67b565926eab9 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sun, 5 Nov 2017 21:00:05 +0100
Subject: [PATCH] merge master

---
 app/build.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c127868b9..f7af72968 100644
--- 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