Fixed merge error

2020-10-19 13:24:22 +02:00
parent c86964cd5e
commit 4106f70218
1 changed files with 1 additions and 0 deletions
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -626,6 +626,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
        displayName: _td("Don't show chat effects"),
        default: false,
+    },
    "Widgets.pinned": {
        supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
        default: {},