fix merge conflicts

2020-01-13 23:47:32 +02:00 · 2020-01-13 23:47:32 +02:00 · b32888194c
commit b32888194c
parent 33abbed5a1 7257189ea7
101 changed files with 2167 additions and 2137 deletions
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@ -43,7 +43,8 @@ const conversation = {
    'collapsable',
    'isPage',
    'pinnedStatusIdsObject',
-    'inProfile'
+    'inProfile',
+    'profileUserId'
  ],
  created () {
    if (this.isPage) {