From b4b2f26200df1b6459be82380f241b91682368fb Mon Sep 17 00:00:00 2001
From: Deven Joshi <deven9852@gmail.com>
Date: Wed, 6 Jan 2021 20:59:17 +0530
Subject: [PATCH] Fixed conflicts and added properties to merge()

---
 lib/src/stream_chat_theme.dart | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/src/stream_chat_theme.dart b/lib/src/stream_chat_theme.dart
index b6fdf074..439bd5ef 100644
--- a/lib/src/stream_chat_theme.dart
+++ b/lib/src/stream_chat_theme.dart
@@ -510,8 +510,8 @@ class ColorTheme {
     ),
     this.borderTop = const Effect(
         sigmaX: 0, sigmaY: -1, color: Color(0xff141924), blur: 0.0),
-    this.borderBottom = const Effect(
-        sigmaX: 0, sigmaY: 1, color: Color(0xff141924), blur: 0.0),
+    this.borderBottom =
+        const Effect(sigmaX: 0, sigmaY: 1, color: Color(0xff141924), blur: 0.0),
     this.shadowIconButton = const Effect(
         sigmaX: 0, sigmaY: 2, color: Color(0xff000000), alpha: 0.5, blur: 4.0),
     this.modalShadow = const Effect(
@@ -532,8 +532,8 @@ class ColorTheme {
     this.accentGreen = const Color(0xff20E070),
     this.borderTop = const Effect(
         sigmaX: 0, sigmaY: -1, color: Color(0xff141924), blur: 0.0),
-    this.borderBottom = const Effect(
-        sigmaX: 0, sigmaY: 1, color: Color(0xff141924), blur: 0.0),
+    this.borderBottom =
+        const Effect(sigmaX: 0, sigmaY: 1, color: Color(0xff141924), blur: 0.0),
     this.shadowIconButton = const Effect(
         sigmaX: 0, sigmaY: 2, color: Color(0xff000000), alpha: 0.5, blur: 4.0),
     this.modalShadow = const Effect(
@@ -634,6 +634,10 @@ class ColorTheme {
       overlay: other.overlay,
       overlayDark: other.overlayDark,
       bgGradient: other.bgGradient,
+      borderTop: other.borderTop,
+      borderBottom: other.borderBottom,
+      shadowIconButton: other.shadowIconButton,
+      modalShadow: other.modalShadow,
     );
   }
 }