Merge remote-tracking branch 'upstream/main'

2024-12-11 19:24:23 +07:00
parent 2f168a2f35 0ce84f5433
commit 746e16f94e
29 changed files with 2487 additions and 333 deletions
--- a/lib/features/feed/models/diets_pagination_model.g.dart
+++ b/lib/features/feed/models/diets_pagination_model.g.dart
@@ -85,7 +85,10 @@ _$AuthorImpl _$$AuthorImplFromJson(Map<String, dynamic> json) => _$AuthorImpl(
      authorProfileIcon: json['author_profile_icon'] as String,
      authorIsMe: json['author_is_me'] as bool,
      isEntitySubscribedByMe: json['is_entity_subscribed_by_me'] as bool?,
+<<<<<<< HEAD
      authorPlaceInRating: (json['author_place_in_rating'] as num?)?.toInt(),
+=======
+>>>>>>> upstream/main
    );

 Map<String, dynamic> _$$AuthorImplToJson(_$AuthorImpl instance) =>