merge confict

Former-commit-id: c6f0a15aa6d0db794f6e7a84fed825fbc1049ad9

merge confict
Former-commit-id: c6f0a15aa6d0db794f6e7a84fed825fbc1049ad9
883566c3 · zhenwu · 79baa075 · 7990c72c · 883566c3
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

core/coverage.sh core/coverage.sh +0 -1

未找到文件。
--- a/core/coverage.sh
+++ b/core/coverage.sh
@@ -130,6 +130,5 @@ if [ $? -ne 0 ]; then
    echo "generate ${FILE_INFO_OUTPUT_NEW} failed"
    exit -2
 fi
-
 # gen html report
 ${LCOV_GEN_CMD} "${FILE_INFO_OUTPUT_NEW}" --output-directory ${DIR_LCOV_OUTPUT}/