Fix master conflict from merging 2 PRs

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Oct 21, 2019 · ec15df2 · ec15df2
1 parent f01df12
commit ec15df2
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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'