Added missing files

app/build.gradle

@@ -13,8 +13,13 @@ 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
@@ -26,7 +31,10 @@ android {
         }
         buildTypes.each {
             it.buildConfigField('boolean', 'PRERELEASE', 'true')
+<<<<<<< HEAD
             it.buildConfigField('boolean', 'CENSOR', 'false')
+=======
+>>>>>>> origin/development
         }
     }
     kotlinOptions {
@@ -56,9 +64,15 @@ 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'
@@ -67,7 +81,10 @@ 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'