merge files.

diff --cc .gitignore
index 94c7a23,94c7a23..38bb84b
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -4,3 -4,3 +4,4 @@@ buil
  .idea/
  .gradle/
  import-summary.txt
++local.properties

diff --cc app/version_code.properties
index a387cbd,413bcf1..1b0c508
--- 1/app/version_code.properties
--- 2/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,2 -1,2 +1,1 @@@
- #Wed Jun 30 12:09:33 CST 2021\r
- VERSION_CODE=881\r
 -#Wed Jun 30 14:29:27 CST 2021\r
 -VERSION_CODE=880\r
++VERSION_CODE=881

diff --cc local.properties
index f88edb6,553ff13..3ff6dd5
--- 1/local.properties
--- 2/local.properties
+++ b/local.properties
@@@ -4,5 -4,4 +4,5 @@@
  # Location of the SDK. This is only used by Gradle.\r
  # For customization when using a Version Control System, please read the\r
  # header note.\r
 -sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk\r
 +#Tue Jun 29 20:13:18 CST 2021\r
- sdk.dir=E\:\\Android\\Sdk\r
++sdk.dir=E\:\\Android\\Sdk