fixing conflicts

This commit is contained in:
jasper 2019-02-08 13:20:47 -08:00
parent ced29a6482
commit 5b52e020e3

View file

@ -29,7 +29,7 @@ const defaultState = {
nsfwCensorImage: undefined, nsfwCensorImage: undefined,
vapidPublicKey: undefined, vapidPublicKey: undefined,
noAttachmentLinks: false, noAttachmentLinks: false,
showFeaturesPanel: false, showFeaturesPanel: true,
// Nasty stuff // Nasty stuff
pleromaBackend: true, pleromaBackend: true,