CorneliuSmith · CodeCrafter1 · Oct 17, 2020 · Oct 22, 2020 · Oct 22, 2020 · Oct 22, 2020
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gradle/.DS_Store b/.gradle/.DS_Store
diff --git a/.gradle/6.5/executionHistory/executionHistory.bin b/.gradle/6.5/executionHistory/executionHistory.bin
diff --git a/.gradle/6.5/executionHistory/executionHistory.lock b/.gradle/6.5/executionHistory/executionHistory.lock
diff --git a/.gradle/6.5/fileHashes/fileHashes.bin b/.gradle/6.5/fileHashes/fileHashes.bin
diff --git a/.gradle/6.5/fileHashes/fileHashes.lock b/.gradle/6.5/fileHashes/fileHashes.lock
diff --git a/.gradle/6.5/fileHashes/resourceHashesCache.bin b/.gradle/6.5/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/6.5/javaCompile/classAnalysis.bin b/.gradle/6.5/javaCompile/classAnalysis.bin
diff --git a/.gradle/6.5/javaCompile/jarAnalysis.bin b/.gradle/6.5/javaCompile/jarAnalysis.bin
diff --git a/.gradle/6.5/javaCompile/javaCompile.lock b/.gradle/6.5/javaCompile/javaCompile.lock
diff --git a/.gradle/6.5/javaCompile/taskHistory.bin b/.gradle/6.5/javaCompile/taskHistory.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
+#Wed Oct 21 18:34:51 PDT 2020
+=======
 #Fri Oct 23 01:43:22 PDT 2020
+>>>>>>> master
 gradle.version=6.5
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/checksums/md5-checksums 2.bin b/.gradle/checksums/md5-checksums 2.bin
diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin
diff --git a/.gradle/checksums/sha1-checksums 2.bin b/.gradle/checksums/sha1-checksums 2.bin
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/.idea/.DS_Store b/.idea/.DS_Store
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.gitignore 2 b/.idea/.gitignore 2
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml
diff --git a/...ndroidx_appcompat_appcompat_1_1_0_aar.xml → ...ndroidx_appcompat_appcompat_1_2_0_aar.xml b/...ndroidx_appcompat_appcompat_1_1_0_aar.xml → ...ndroidx_appcompat_appcompat_1_2_0_aar.xml
diff --git a/...pcompat_appcompat_resources_1_1_0_aar.xml → ...pcompat_appcompat_resources_1_2_0_aar.xml b/...pcompat_appcompat_resources_1_1_0_aar.xml → ...pcompat_appcompat_resources_1_2_0_aar.xml
diff --git a/...aintlayout_constraintlayout_1_1_3_aar.xml → ...aintlayout_constraintlayout_2_0_2_aar.xml b/...aintlayout_constraintlayout_1_1_3_aar.xml → ...aintlayout_constraintlayout_2_0_2_aar.xml
diff --git a/...tlayout_constraintlayout_solver_1_1_3.xml → ...tlayout_constraintlayout_solver_2_0_2.xml b/...tlayout_constraintlayout_solver_1_1_3.xml → ...tlayout_constraintlayout_solver_2_0_2.xml
diff --git a/.../Gradle__androidx_core_core_1_3_0_aar.xml → .../Gradle__androidx_core_core_1_3_1_aar.xml b/.../Gradle__androidx_core_core_1_3_0_aar.xml → .../Gradle__androidx_core_core_1_3_1_aar.xml
diff --git a/.../Gradle__androidx_test_core_1_2_0_aar.xml → .../Gradle__androidx_test_core_1_3_0_aar.xml b/.../Gradle__androidx_test_core_1_2_0_aar.xml → .../Gradle__androidx_test_core_1_3_0_aar.xml
diff --git a/...test_espresso_espresso_core_3_2_0_aar.xml → ...test_espresso_espresso_core_3_3_0_aar.xml b/...test_espresso_espresso_core_3_2_0_aar.xml → ...test_espresso_espresso_core_3_3_0_aar.xml
diff --git a/...so_espresso_idling_resource_3_2_0_aar.xml → ...so_espresso_idling_resource_3_3_0_aar.xml b/...so_espresso_idling_resource_3_2_0_aar.xml → ...so_espresso_idling_resource_3_3_0_aar.xml
diff --git a/...le__androidx_test_ext_junit_1_1_1_aar.xml → ...le__androidx_test_ext_junit_1_1_2_aar.xml b/...le__androidx_test_ext_junit_1_1_1_aar.xml → ...le__androidx_test_ext_junit_1_1_2_aar.xml
diff --git a/...adle__androidx_test_monitor_1_2_0_aar.xml → ...adle__androidx_test_monitor_1_3_0_aar.xml b/...adle__androidx_test_monitor_1_2_0_aar.xml → ...adle__androidx_test_monitor_1_3_0_aar.xml