From 4106f70218ef41e6101752e388b54b481cbe0576 Mon Sep 17 00:00:00 2001
From: Steffen Kolmer <steffen@kolmer.net>
Date: Mon, 19 Oct 2020 13:24:22 +0200
Subject: [PATCH] Fixed merge error

---
 src/settings/Settings.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 99be728acc..b9ad834c83 100644
--- 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: {},