From: TrillGates <williamtrillgates@gmail.com>
Date: Wed, 30 Jun 2021 04:06:49 +0000 (+0800)
Subject: merge files.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=aad194504783c5c23fae5a03c81ee9dacd936d29;p=icsupport.git

merge files.
---

aad194504783c5c23fae5a03c81ee9dacd936d29
diff --cc app/version_code.properties
index 32347219,279c2e89..f652d3bc
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,5 -1,5 +1,2 @@@
 -#Mon Jun 28 22:42:14 CST 2021
 ->>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
 -VERSION_CODE=879
 -=\=\=\=\=\=\=
 -<<<<<<<=HEAD
 +#Tue Jun 29 19:41:46 CST 2021
- >>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
- VERSION_CODE=880
- <<<<<<<=HEAD
- =\=\=\=\=\=\=
++VERSION_CODE=880