merge branches

This commit is contained in:
amirrezaghabeli
2025-08-10 08:39:48 +03:30
parent ffbe687fdb
commit fe20d1b884
2 changed files with 14 additions and 14 deletions
+1 -4
View File
@@ -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: