Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixing conflicts

Browse source
This commit is contained in:
jasper 2019-02-08 13:18:50 -08:00
parent 92874b6902
commit ced29a6482
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/modules/config.js
View file

@ -30,13 +30,8 @@ const defaultState = {
interfaceLanguage: browserLocale, interfaceLanguage: browserLocale,
scopeCopy: undefined, // instance default scopeCopy: undefined, // instance default
subjectLineBehavior: undefined, // instance default subjectLineBehavior: undefined, // instance default
<<<<<<< HEAD
alwaysShowSubjectInput: undefined // instance default
=======
alwaysShowSubjectInput: undefined, // instance default alwaysShowSubjectInput: undefined, // instance default
showFeaturesPanel: true,
postContentType: undefined // instance default postContentType: undefined // instance default
>>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac
} }
const config = { const config = {