merge branches
This commit is contained in:
+1
-4
@@ -29,11 +29,8 @@ dev_dependencies:
|
||||
flutter_gen_runner:
|
||||
build_runner: ^2.5.4
|
||||
go_router_builder: ^3.0.0
|
||||
<<<<<<< HEAD
|
||||
json_serializable: ^6.9.5
|
||||
=======
|
||||
json_serializable: ^6.7.1
|
||||
>>>>>>> origin/refactor_dark_mood_repository
|
||||
|
||||
|
||||
|
||||
flutter:
|
||||
|
||||
Reference in New Issue
Block a user