From 7a403ce83947533f1d684f3d21369325582830ea Mon Sep 17 00:00:00 2001 From: Tak Wai Wong Date: Thu, 10 Mar 2022 10:22:39 -0800 Subject: [PATCH] refresh dendrite main --- build/docker/config/dendrite.yaml | 3 +++ setup/config/config_test.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/build/docker/config/dendrite.yaml b/build/docker/config/dendrite.yaml index 3b8eada17..6c5cdd8ce 100644 --- a/build/docker/config/dendrite.yaml +++ b/build/docker/config/dendrite.yaml @@ -312,6 +312,7 @@ user_api: max_open_conns: 10 max_idle_conns: 2 conn_max_lifetime: -1 +<<<<<<< HEAD # Configuration for the Push Server API. push_server: @@ -323,6 +324,8 @@ push_server: max_open_conns: 10 max_idle_conns: 2 conn_max_lifetime: -1 +======= +>>>>>>> bc7a8b0600c5d121807b45a8be59dfd8731716c4 # Configuration for the Push Server API. push_server: diff --git a/setup/config/config_test.go b/setup/config/config_test.go index 792baafe5..bed3bfe06 100644 --- a/setup/config/config_test.go +++ b/setup/config/config_test.go @@ -200,11 +200,14 @@ user_api: max_open_conns: 100 max_idle_conns: 2 conn_max_lifetime: -1 +<<<<<<< HEAD pusher_database: connection_string: file:pushserver.db max_open_conns: 100 max_idle_conns: 2 conn_max_lifetime: -1 +======= +>>>>>>> bc7a8b0600c5d121807b45a8be59dfd8731716c4 pusher_database: connection_string: file:pushserver.db max_open_conns: 100