fix conflicts

Former-commit-id: d23695bdff018e5c94e92286307c6dc52df8ee93
This commit is contained in:
Yu Kun 2019-09-05 11:31:00 +08:00
parent 3f6c9ce766
commit c4536f0d74

View File

@ -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();