fix merge conflict

2019-01-23 16:12:21 +01:00 · 2019-01-23 16:12:21 +01:00 · 9269dcc984
commit 9269dcc984
parent 2eb75d6c18 e7a0dc62c5
38 changed files with 353 additions and 3 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -14,12 +14,14 @@ android {
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
        vectorDrawables.useSupportLibrary = true
    }
+
    buildTypes {
        release {
            minifyEnabled true
            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
+
        debug {
            multiDexEnabled true
            debuggable true
@ -33,6 +35,7 @@ android {
        // but continue the build even when errors are found:
        abortOnError false
    }
+
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8