Fixed failing tests

2022-04-14 14:37:39 +05:30
parent 9d0f66ee8c
commit 478033078f
3 changed files with 32 additions and 16 deletions
@@ -36,11 +36,7 @@ dependencies:
  rxdart: ^0.27.0
  share_plus: ^4.0.1
  shimmer: ^2.0.0
-<<<<<<< HEAD
  stream_chat_flutter_core: ^4.0.0-beta.0
-=======
-  stream_chat_flutter_core: ^3.6.1
->>>>>>> develop
  substring_highlight: ^1.0.26
  url_launcher: ^6.0.3
  video_player: ^2.1.0