From 3527c146250ff12b83abb8fb1126fe54b323931e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 25 Mar 2020 18:38:06 +0200
Subject: [PATCH] fix list after conflict

---
 src/components/settings/settings.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index ca4c9e411..fd44c5752 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -96,6 +96,8 @@
                   <Checkbox v-model="virtualScrolling">
                     {{ $t('settings.virtual_scrolling') }}
                   </Checkbox>
+                </li>
+                <li>
                   <Checkbox v-model="emojiReactionsOnTimeline">
                     {{ $t('settings.emoji_reactions_on_timeline') }}
                   </Checkbox>