Removed useless test.

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)

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;