framework: fix bugs from merging conflict

Signed-off-by: fengqikai1414 <fengqikai1414@126.com>

framework: fix bugs from merging conflict
Signed-off-by: fengqikai1414 <fengqikai1414@126.com>
b3738e85 · ZeusJupiter · GoLancer · 53bc55ff · b3738e85
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

framework/python/wrapper/test/test_init.cpp framework/python/wrapper/test/test_init.cpp +1 -0

未找到文件。
--- a/framework/python/wrapper/test/test_init.cpp
+++ b/framework/python/wrapper/test/test_init.cpp
@@ -31,3 +31,4 @@ int main(int argc, char** argv) {
  testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
+