fix conflicts

Former-commit-id: 5bf67736ef9c4a6dc505899a2bf5cb289c3c5aa5

fix conflicts
Former-commit-id: 5bf67736ef9c4a6dc505899a2bf5cb289c3c5aa5
9f832656 · Yu Kun · d6c314b9 · 9f832656
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

cpp/conf/server_config.template cpp/conf/server_config.template +2 -2

未找到文件。
--- 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