diff options
Diffstat (limited to 'src/modules/config.js')
| -rw-r--r-- | src/modules/config.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index c9528f6f..eb2df541 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -30,7 +30,13 @@ const defaultState = { interfaceLanguage: browserLocale, scopeCopy: undefined, // instance default subjectLineBehavior: undefined, // instance default +<<<<<<< HEAD alwaysShowSubjectInput: undefined // instance default +======= + alwaysShowSubjectInput: undefined, // instance default + showFeaturesPanel: true, + postContentType: undefined // instance default +>>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac } const config = { |