diff options
| author | Henry Jameson <me@hjkos.com> | 2019-07-06 23:52:10 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-07-06 23:52:10 +0300 |
| commit | 1ec4caa0bbea18854a8a7bccaa7e2a0ea8bdf79e (patch) | |
| tree | 54ecacaeac0a13905b51acc87c179e42baf0bde7 /src/components/conversation/conversation.vue | |
| parent | 8f5379642029f730aa3d905c6980433c6c901486 (diff) | |
fix merge conflict
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 2 |
1 files changed, 1 insertions, 1 deletions
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> |