From ec15df2bc3884cf3fab0a0d9cc206c94a0aedcfd Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 21 Oct 2019 12:46:31 +0200
Subject: [PATCH] Fix master conflict from merging 2 PRs

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/Navigation/ConversationsList/Conversation.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Navigation/ConversationsList/Conversation.vue b/src/components/Navigation/ConversationsList/Conversation.vue
index c23da0731e9..0859796f620 100644
--- a/src/components/Navigation/ConversationsList/Conversation.vue
+++ b/src/components/Navigation/ConversationsList/Conversation.vue
@@ -94,7 +94,6 @@
 </template>
 
 <script>
-import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
 import ConversationIcon from './../../ConversationIcon'
 import AppNavigationCounter from 'nextcloud-vue/dist/Components/AppNavigationCounter'
 import AppContentListItem from './AppContentListItem/AppContentListItem'