diff options
| author | jasper <jasper92341@hotmail.com> | 2019-02-08 13:18:50 -0800 |
|---|---|---|
| committer | jasper <jasper92341@hotmail.com> | 2019-02-08 13:18:50 -0800 |
| commit | ced29a64827ee4f34c71776cb217188093e7ee58 (patch) | |
| tree | e591061b7e6776173b7e23beee32a5c54f753190 /src | |
| parent | 92874b6902ee0d06ac4603c0b6351ccab92c60a5 (diff) | |
fixing conflicts
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/config.js | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index eb2df541..71f71376 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -30,13 +30,8 @@ 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 = { |