fix conflicts

Former-commit-id: d23695bdff018e5c94e92286307c6dc52df8ee93

fix conflicts
Former-commit-id: d23695bdff018e5c94e92286307c6dc52df8ee93
c4536f0d · Yu Kun · 3f6c9ce7 · c4536f0d
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

cpp/src/scheduler/SchedInst.cpp cpp/src/scheduler/SchedInst.cpp +1 -1

未找到文件。
--- a/cpp/src/scheduler/SchedInst.cpp
+++ b/cpp/src/scheduler/SchedInst.cpp
@@ -25,7 +25,7 @@ StartSchedulerService() {
    try {
        server::ConfigNode &config = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_RESOURCE);

-        if (config.GetSequences().empty() || config.GetChildren().empty()) throw "resource_config null exception";
+        if (config.GetChildren().empty()) throw "resource_config null exception";

        auto resources = config.GetChild(server::CONFIG_RESOURCES).GetChildren();