44444

5ffc9408 · 李定达 · bef5a799 · 5ffc9408
Commit 5ffc9408 authored Apr 26, 2019 by 李定达
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

ClientFrame/main.cpp
+5 -5

No files found.
--- a/ClientFrame/main.cpp
+++ b/ClientFrame/main.cpp
@@ -693,13 +693,13 @@ TEST(TestAPP, testfont7)

 int main(int argc, char *argv[])
 {
-<<<<<<< HEAD
-	testing::GTEST_FLAG(output) = "xml:TestReport_A.xml";
-	testing::InitGoogleTest(&argc, argv);
-=======
+//<<<<<<< HEAD
+//	testing::GTEST_FLAG(output) = "xml:TestReport_A.xml";
+//	testing::InitGoogleTest(&argc, argv);
+//=======
 	::testing::InitGoogleTest(&argc, argv);
 	testing::GTEST_FLAG(output) = "xml:ClientFrame.xml";
->>>>>>> 7325325e99dde39ca6470c896246e41b86362de0
+//>>>>>>> 7325325e99dde39ca6470c896246e41b86362de0
 	//teststring();
 	RUN_ALL_TESTS();
 	//testaddmumber();