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

Fix merge conflicts

Browse source
This commit is contained in:
Sean King 2022-08-06 22:02:21 -06:00
commit dc9951d400
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
166 changed files with 2374 additions and 1602 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/config.js
View file

@ -82,6 +82,8 @@ export const defaultState = {
useContainFit: true,
disableStickyHeaders: false,
showScrollbars: false,
userPopoverZoom: false,
userPopoverOverlay: true,
greentext: undefined, // instance default
useAtIcon: undefined, // instance default
mentionLinkDisplay: undefined, // instance default
@ -146,7 +148,7 @@ const config = {
const knownKeys = new Set(Object.keys(defaultState))
const presentKeys = new Set(Object.keys(data))
const intersection = new Set()
for (let elem of presentKeys) {
for (const elem of presentKeys) {
if (knownKeys.has(elem)) {
intersection.add(elem)
}