From c5f2d7cc787b5857d8eb8282a78057934b0141b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 20 Jun 2019 11:26:51 +0200
Subject: [PATCH] Solve remaind merge conflict

---
 webapp/components/Editor/index.vue | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/webapp/components/Editor/index.vue b/webapp/components/Editor/index.vue
index b6e460c83..cbfaec854 100644
--- a/webapp/components/Editor/index.vue
+++ b/webapp/components/Editor/index.vue
@@ -187,11 +187,8 @@ import {
   History,
 } from 'tiptap-extensions'
 import Mention from './nodes/Mention.js'
-<<<<<<< HEAD
 import Tag from './nodes/Tag.js'
-=======
 import { mapGetters } from 'vuex'
->>>>>>> origin/master
 
 let throttleInputEvent
 
@@ -386,17 +383,12 @@ export default {
     }
   },
   computed: {
-<<<<<<< HEAD
+    ...mapGetters({ placeholder: 'editor/placeholder' }),
     usersFilterHasResults() {
       return this.filteredUsers.length > 0
     },
     tagsFilterHasResults() {
       return this.filteredTags.length > 0
-=======
-    ...mapGetters({ placeholder: 'editor/placeholder' }),
-    hasResults() {
-      return this.filteredUsers.length
->>>>>>> origin/master
     },
     showSuggestions() {
       return this.query || this.usersFilterHasResults || this.tagsFilterHasResults