forked from eatvio/eatvio_app
Merge remote-tracking branch 'refs/remotes/origin/feature/feed'
# Conflicts: # lib/features/calendar/presentation/pages/calendar_screen.dart # lib/features/diary/presentation/pages/diary_screen.dart
This commit is contained in:
@@ -11,6 +11,5 @@ class CalendarModel with _$CalendarModel {
|
||||
Object? diary,
|
||||
}) = _CalendarModel;
|
||||
|
||||
factory CalendarModel.fromJson(Map<String, Object?> json) =>
|
||||
_$CalendarModelFromJson(json);
|
||||
factory CalendarModel.fromJson(Map<String, Object?> json) => _$CalendarModelFromJson(json);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user