From 9f832656a020c304f0f20f087d380e627a03d9bf Mon Sep 17 00:00:00 2001
From: Yu Kun <kun.yu@zilliz.com>
Date: Thu, 12 Sep 2019 11:28:20 +0800
Subject: [PATCH] fix conflicts

Former-commit-id: 5bf67736ef9c4a6dc505899a2bf5cb289c3c5aa5
---
 cpp/conf/server_config.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpp/conf/server_config.template b/cpp/conf/server_config.template
index f1615b36..7b59f17a 100644
--- a/cpp/conf/server_config.template
+++ b/cpp/conf/server_config.template
@@ -56,12 +56,12 @@ resource_config:
     cpu:
       type: CPU
       device_id: 0
-      enable_executor: false
+      enable_executor: true
 
     gpu0:
       type: GPU
       device_id: 0
-      enable_executor: true
+      enable_executor: false
       gpu_resource_num: 2
       pinned_memory: 300
       temp_memory: 300
-- 
GitLab