talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: fix merge conflicts

Browse Source 
Signed-off-by: xsahil03x <[email protected]>
This commit is contained in:
Sahil Kumar
2021-07-16 12:19:50 +05:30
committed by xsahil03x
parent 03f71595ac
commit c2563c9d5f
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
-2
View File
@@ -55,7 +55,6 @@ class StreamChatThemeData {
MessageTheme? otherMessageTheme, MessageTheme? otherMessageTheme,
MessageTheme? ownMessageTheme, MessageTheme? ownMessageTheme,
MessageInputTheme? messageInputTheme, MessageInputTheme? messageInputTheme,
Widget Function(BuildContext, Channel)? defaultChannelImage,
Widget Function(BuildContext, User)? defaultUserImage, Widget Function(BuildContext, User)? defaultUserImage,
IconThemeData? primaryIconTheme, IconThemeData? primaryIconTheme,
List<ReactionIcon>? reactionIcons, List<ReactionIcon>? reactionIcons,
@@ -79,7 +78,6 @@ class StreamChatThemeData {
otherMessageTheme: otherMessageTheme, otherMessageTheme: otherMessageTheme,
ownMessageTheme: ownMessageTheme, ownMessageTheme: ownMessageTheme,
messageInputTheme: messageInputTheme, messageInputTheme: messageInputTheme,
defaultChannelImage: defaultChannelImage,
defaultUserImage: defaultUserImage, defaultUserImage: defaultUserImage,
primaryIconTheme: primaryIconTheme, primaryIconTheme: primaryIconTheme,
reactionIcons: reactionIcons, reactionIcons: reactionIcons,