From f2a16157de61084d3fca936c0fbdf392758092c9 Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Wed, 20 Nov 2019 08:20:23 +1300
Subject: [PATCH] Removed useless test.

---
 src/test/unit/cli_unittest.cc        | 4 ----
 src/test/unit/flight_imu_unittest.cc | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/test/unit/cli_unittest.cc b/src/test/unit/cli_unittest.cc
index ff892fb688..04e9dc8c53 100644
--- a/src/test/unit/cli_unittest.cc
+++ b/src/test/unit/cli_unittest.cc
@@ -113,10 +113,6 @@ TEST(CLIUnittest, TestCliSetArray)
     EXPECT_EQ(123, data[0]);
     EXPECT_EQ( -3, data[1]);
     EXPECT_EQ(  1, data[2]);
-
-
-    //cliGet((char *)"osd_item_vbat");
-    //EXPECT_FALSE(false);
 }
 
 TEST(CLIUnittest, TestCliSetStringNoFlags)
diff --git a/src/test/unit/flight_imu_unittest.cc b/src/test/unit/flight_imu_unittest.cc
index fcb5e95f07..bd4108bc2e 100644
--- a/src/test/unit/flight_imu_unittest.cc
+++ b/src/test/unit/flight_imu_unittest.cc
@@ -175,11 +175,7 @@ TEST(FlightImuTest, TestSmallAngle)
     imuComputeRotationMatrix();
 
     // expect
-<<<<<<< HEAD
-    EXPECT_EQ(false, isUpright());
-=======
-    EXPECT_TRUE(isUpright());
->>>>>>> Improved tests.
+    EXPECT_FALSE(isUpright());
 
     // given
     rMat[0][0] = r1;