From: TrillGates <williamtrillgates@gmail.com>
Date: Mon, 21 Jun 2021 13:15:40 +0000 (+0800)
Subject: merge files.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=7d773d3d1d5c7797828cde3d4c05c72d563a6c59;p=protocol_srv.git

merge files.
---

7d773d3d1d5c7797828cde3d4c05c72d563a6c59
diff --cc app/version_code.properties
index 6fe81971,a92f2a03..23ceef42
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,2 -1,2 +1,7 @@@
 -#Mon Jun 21 15:35:03 CST 2021
 -VERSION_CODE=810
++<<<<<<< HEAD
 +#Mon Jun 21 21:14:35 CST 2021
 +VERSION_CODE=813
++=======
++#Mon Jun 21 15:35:03 CST 2021
++VERSION_CODE=810
++>>>>>>> b405d1184f3616d4e894d199cee0eb91613a68db