Merge branch 'mc'

6e2d9cfc · nanahira · 7dff50f3 · 1b03279f · 6e2d9cfc
Commit 6e2d9cfc authored Jul 29, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

data/default_config.json data/default_config.json +1 -1

No files found.
--- a/data/default_config.json
+++ b/data/default_config.json
@@ -99,7 +99,7 @@
    "reconnect": {
      "enabled": true,
      "auto_surrender_after_disconnect": false,
-      "wait_time": 300000
+      "wait_time": 60000
    },
    "heartbeat_detection": {
      "enabled": true,