From 1ec4caa0bbea18854a8a7bccaa7e2a0ea8bdf79e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 6 Jul 2019 23:52:10 +0300
Subject: fix merge conflict

---
 src/components/conversation/conversation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index f5642c73..5a900607 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -26,8 +26,8 @@
       :in-conversation="isExpanded"
       :highlight="getHighlight()"
       :replies="getReplies(status.id)"
-      @goto="setHighlight"
       class="status-fadein panel-body"
+      @goto="setHighlight"
       @toggleExpanded="toggleExpanded"
     />
   </div>
-- 
cgit v1.2.3-70-g09d2