fixing conflicts

2019-02-08 13:18:50 -08:00 · 2019-02-08 13:18:50 -08:00 · ced29a6482
parent 92874b6902
commit ced29a6482
1 changed files with 0 additions and 5 deletions
--- 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 = {