diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-01 18:17:09 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-01 18:17:09 -0600 |
| commit | 081aa0fd0552732f208bd35e37cde06c66536791 (patch) | |
| tree | 053827cd9d9b258d6752195ab09eabd37d4c813b /src/components/conversation/conversation.js | |
| parent | 75216c5feb32b32e24952663ffa4233410585785 (diff) | |
| parent | 3fc9673a7d0fb851283e4ed687c2fd7790f03317 (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/components/conversation/conversation.js')
| -rw-r--r-- | src/components/conversation/conversation.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index f8df9eb5..47509e86 100644 --- 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++ |