From: k.liang <liangkang648253071@126.com>
Date: Tue, 29 Jun 2021 11:56:23 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=67356055c039961271423148d00a7c75204b3409;p=protocol_srv.git

Merge remote-tracking branch 'origin/mqtt_test' into mqtt_test

# Conflicts:
#	app/version_code.properties
#	local.properties
---

67356055c039961271423148d00a7c75204b3409
diff --cc app/version_code.properties
index b3fe9943,5f2d7c3e..279c2e89
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@@ -1,2 -1,5 +1,5 @@@
- #Tue Jun 29 18:09:20 CST 2021
- VERSION_CODE=840
 -#Mon Jun 28 22:42:14 CST 2021
 ->>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
 -VERSION_CODE=879
 -=\=\=\=\=\=\=
 -<<<<<<<=HEAD
++#Mon Jun 28 22:42:14 CST 2021
++>>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
++VERSION_CODE=879
++=\=\=\=\=\=\=
++<<<<<<<=HEAD