fix merge

GetStream · Nov 29, 2021 · c631edd · c631edd
1 parent 045521e
commit c631edd
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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