Merge branch 'master' of gitlab.freemud.com:dingda.li/ClientFrame

# Conflicts:
#	ClientFrame/main.cpp

ClientFrame/main.cpp

@@ -363,7 +363,7 @@ TEST(TestAPP, TestJsonConvertFrontAndPost)
 		\"voucherNumber\": \"\", \
 		\"storeNumber\": \"12314\", \
 		\"requestAccount\": \"xxxxxx\", \
-		\"signParam\": \"Ҵ󱯣\", \
+		\"signParam\": \"Ҵ󱯣\", \
 		\"resultCode\": \"1\" \
 	}";
 
@@ -693,8 +693,13 @@ TEST(TestAPP, testfont7)
 
 int main(int argc, char *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
 	//teststring();
 	RUN_ALL_TESTS();
 	//testaddmumber();