From c4536f0d748a7fabf6fbe22a27e89651b88eb9ea Mon Sep 17 00:00:00 2001
From: Yu Kun <kun.yu@zilliz.com>
Date: Thu, 5 Sep 2019 11:31:00 +0800
Subject: [PATCH] fix conflicts

Former-commit-id: d23695bdff018e5c94e92286307c6dc52df8ee93
---
 cpp/src/scheduler/SchedInst.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/src/scheduler/SchedInst.cpp b/cpp/src/scheduler/SchedInst.cpp
index fe7a32ed29..bbffe719e2 100644
--- 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();