glossary for diet creation fixed

2024-12-11 19:51:40 +07:00
parent 746e16f94e
commit e9a4c518be
5 changed files with 19 additions and 11 deletions
--- a/lib/features/feed/models/diets_pagination_model.g.dart
+++ b/lib/features/feed/models/diets_pagination_model.g.dart
@@ -85,10 +85,7 @@ _$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) =>