From 01a056da4b8e7a8b03fc4f6d7aaf61735ab0596b Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Wed, 4 Dec 2024 19:40:53 +0800
Subject: [PATCH 1/2] Update version to 1.1.14

Based Core Version to 1.2.10
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a2a0a9ab..209c250a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 // 10,00,000 major-minor-build
 def AppMajorVersion = 1
 def AppMinorVersion = 1
-def AppBuildNumber = 13
+def AppBuildNumber = 14
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

From 11bab5a6310a66d612536abfa3d61037d7ca91ea Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Thu, 5 Dec 2024 21:50:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/SensorsProtocol.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp
index 49e354f0..b4c99e30 100644
--- a/app/src/main/cpp/SensorsProtocol.cpp
+++ b/app/src/main/cpp/SensorsProtocol.cpp
@@ -1074,12 +1074,7 @@ void testComm()
 	for (;;)
 	{
 #if COLLECT_DATA
-<<<<<<< HEAD
       Collect_sensor_data();
-=======
-
-		Collect_sensor_data();
->>>>>>> cf0f3f52d373254ad85da3aa96b1e8c8f7c34070
 #else
 		sleep(15);
 		CameraPhotoCmd(time(NULL), 1, 0, 6, 1, "/dev/ttyS1",38400, 1);