fix merge conflict

4fb8eb09 · xulongteng · 0cf2b840 · a8046813 · 4fb8eb09
显示空白变更内容
内联并排

Showing with 1 addition and 1 deletion

cube/cube-builder/CMakeLists.txt cube/cube-builder/CMakeLists.txt +1 -1

未找到文件。
--- a/cube/cube-builder/CMakeLists.txt
+++ b/cube/cube-builder/CMakeLists.txt
@@ -31,7 +31,7 @@ set(DYNAMIC_LIB
    -lcurl
    -lssl
    -lcrypto
-    ${CURL_LIB}
+#    ${CURL_LIB}
    )

 target_link_libraries(cube-builder ${DYNAMIC_LIB})