From c631edddf9116b5f4bd28c45a853e73f541d9993 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 29 Nov 2021 17:50:54 +0100
Subject: [PATCH] fix merge

---
 packages/stream_chat/pubspec.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index 772f57d7..38ee620c 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -1,11 +1,7 @@
 name: stream_chat
 homepage: https://getstream.io/
 description: The official Dart client for Stream Chat, a service for building chat applications.
-<<<<<<< HEAD
-version: 3.2.1
-=======
 version: 3.3.0
->>>>>>> develop
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues