Merge conflicts

app/build.gradle

@@ -13,13 +13,8 @@ android {
         applicationId "xyz.quaver.pupil"
         minSdkVersion 16
         targetSdkVersion 29
-<<<<<<< HEAD
         versionCode 27
         versionName "3.2-beta2"
-=======
-        versionCode 26
-        versionName "3.2-beta"
->>>>>>> origin/development
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -31,10 +26,7 @@ android {
         }
         buildTypes.each {
             it.buildConfigField('boolean', 'PRERELEASE', 'true')
-<<<<<<< HEAD
             it.buildConfigField('boolean', 'CENSOR', 'false')
-=======
->>>>>>> origin/development
         }
     }
     kotlinOptions {
@@ -64,15 +56,9 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.android.support:multidex:1.0.3'
-<<<<<<< HEAD
     implementation 'com.google.android.material:material:1.1.0-alpha09'
     implementation 'com.google.firebase:firebase-core:17.1.0'
     implementation 'com.google.firebase:firebase-perf:19.0.0'
-=======
-    implementation 'com.google.android.material:material:1.1.0-alpha08'
-    implementation 'com.google.firebase:firebase-core:17.0.1'
-    implementation 'com.google.firebase:firebase-perf:18.0.1'
->>>>>>> origin/development
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
     implementation 'com.github.arimorty:floatingsearchview:2.1.1'
     implementation 'com.github.clans:fab:1.6.4'
@@ -81,10 +67,7 @@ dependencies {
         transitive = false
     }
     implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
-<<<<<<< HEAD
     implementation 'com.jsibbold:zoomage:1.3.0'
-=======
->>>>>>> origin/development
     implementation "ru.noties.markwon:core:${markwonVersion}"
     kapt 'com.github.bumptech.glide:compiler:4.9.0'
     testImplementation 'junit:junit:4.12'

build.gradle

@@ -1,11 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-<<<<<<< HEAD
     ext.kotlin_version = '1.3.50'
-=======
-    ext.kotlin_version = '1.3.41'
->>>>>>> origin/development
     repositories {
         google()
         jcenter()
@@ -14,7 +10,6 @@ buildscript {
         }
     }
     dependencies {
-<<<<<<< HEAD
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
@@ -24,17 +19,6 @@ buildscript {
         // in the individual module build.gradle files
         classpath 'io.fabric.tools:gradle:1.29.0'
         classpath 'com.google.firebase:perf-plugin:1.3.1'
-=======
-        classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.0'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-        classpath 'io.fabric.tools:gradle:1.29.0'
-        classpath 'com.google.firebase:perf-plugin:1.3.0'
->>>>>>> origin/development
     }
 }