Fix merge conflicts

2022-08-01 18:17:09 -06:00 · 2022-08-01 18:17:09 -06:00 · 081aa0fd05
commit 081aa0fd05
parent 75216c5feb 3fc9673a7d
167 changed files with 3481 additions and 2487 deletions
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@ -276,7 +276,7 @@ const conversation = {
          result[irid] = result[irid] || []
          result[irid].push({
            name: `#${i}`,
-            id: id
+            id
          })
        }
        i++
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@ -31,8 +31,8 @@
            keypath="status.show_all_conversation_with_icon"
            tag="button"
            class="button-unstyled -link"
-            @click.prevent="diveToTopLevel"
            scope="global"
+            @click.prevent="diveToTopLevel"
          >
            <template #icon>
              <FAIcon