fix merge conflict

2019-07-06 23:52:10 +03:00 · 2019-07-06 23:52:10 +03:00 · 1ec4caa0bb
commit 1ec4caa0bb
parent 8f53796420
2 changed files with 142 additions and 23 deletions
--- 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>