merge files.

diff --cc app/src/main/java/com/enqualcomm/support/Config.java
Simple merge

diff --cc app/version_code.properties
index 6fe8197,a92f2a0..23ceef4
--- 1/app/version_code.properties
--- 2/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,2 -1,2 +1,7 @@@
 -#Mon Jun 21 15:35:03 CST 2021\r
 -VERSION_CODE=810\r
++<<<<<<< HEAD
 +#Mon Jun 21 21:14:35 CST 2021
 +VERSION_CODE=813
++=======
++#Mon Jun 21 15:35:03 CST 2021
++VERSION_CODE=810
++>>>>>>> b405d1184f3616d4e894d199cee0eb91613a68db