mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-14 07:50:33 +03:00
Fixed merge error
This commit is contained in:
parent
c86964cd5e
commit
4106f70218
1 changed files with 1 additions and 0 deletions
|
@ -626,6 +626,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
|
||||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||||
displayName: _td("Don't show chat effects"),
|
displayName: _td("Don't show chat effects"),
|
||||||
default: false,
|
default: false,
|
||||||
|
},
|
||||||
"Widgets.pinned": {
|
"Widgets.pinned": {
|
||||||
supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
|
supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
|
||||||
default: {},
|
default: {},
|
||||||
|
|
Loading…
Reference in a new issue