修复错误的合并

6 months ago · 11bab5a631
parent 87eac6bd08
commit 11bab5a631
1 changed files with 0 additions and 5 deletions
--- 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);