From c2563c9d5f72a262572f605d0c43a203f7c95b9a Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Fri, 16 Jul 2021 12:19:50 +0530
Subject: [PATCH] chore: fix merge conflicts

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/lib/src/stream_chat_theme.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart b/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
index 0c56fd0d..c62e92ec 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat_theme.dart
@@ -55,7 +55,6 @@ class StreamChatThemeData {
     MessageTheme? otherMessageTheme,
     MessageTheme? ownMessageTheme,
     MessageInputTheme? messageInputTheme,
-    Widget Function(BuildContext, Channel)? defaultChannelImage,
     Widget Function(BuildContext, User)? defaultUserImage,
     IconThemeData? primaryIconTheme,
     List<ReactionIcon>? reactionIcons,
@@ -79,7 +78,6 @@ class StreamChatThemeData {
       otherMessageTheme: otherMessageTheme,
       ownMessageTheme: ownMessageTheme,
       messageInputTheme: messageInputTheme,
-      defaultChannelImage: defaultChannelImage,
       defaultUserImage: defaultUserImage,
       primaryIconTheme: primaryIconTheme,
       reactionIcons: reactionIcons,