From 937b6480d534b3051cadf4a892a9aa210bec579a Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Thu, 25 Oct 2018 13:25:27 -0400
Subject: MM-12342: merge the experimental channel store (#9681)

* MM-12342: merge the experimental channel store

* gofmt after upgrading to go 1.11
---
 config/default.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'config/default.json')

diff --git a/config/default.json b/config/default.json
index 3daa6a3e0..6d428dd4a 100644
--- a/config/default.json
+++ b/config/default.json
@@ -133,8 +133,7 @@
         "MaxOpenConns": 300,
         "Trace": false,
         "AtRestEncryptKey": "",
-        "QueryTimeout": 30,
-        "EnablePublicChannelsMaterialization": true
+        "QueryTimeout": 30
     },
     "LogSettings": {
         "EnableConsole": true,
-- 
cgit v1.2.3-1-g7c22