Skip to content

Commit 8f5e7d3

Browse files
nhannahnhannah
committed
fix merge order conflict on Channel
1 parent dea0d4f commit 8f5e7d3

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

‎src/components/Channel/Channel.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,6 +1579,7 @@ const ChannelWithContext = <
15791579
MessageAvatar,
15801580
MessageContent,
15811581
messageContentOrder,
1582+
MessageDeleted,
15821583
MessageFooter,
15831584
MessageHeader,
15841585
MessageList,

0 commit comments

Comments
 (0)