forked from eatvio/eatvio_app
Merge remote-tracking branch 'refs/remotes/origin/diary_refactor'
# Conflicts: # lib/app_router.dart # lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart # lib/features/blog_post_create/services/blog_service.dart # lib/features/calendar/services/calendar_service.g.dart # lib/features/diary/presentation/bloc/diary_cubit.dart # lib/features/diary/presentation/bloc/diary_event.dart # lib/features/diary/presentation/bloc/diary_state.dart # lib/features/diary/presentation/pages/diary_screen.dart # lib/features/diary/repositories/diary_repository.dart # lib/features/diary/services/diary_service.dart # lib/locator_service.dart # lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart # lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart # lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart # lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart # pubspec.yaml
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
/*
|
||||
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||
|
||||
part '../../../presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart';
|
||||
@@ -14,3 +15,4 @@ class BlogPostCreateCredentialsModel with _$BlogPostCreateCredentialsModel {
|
||||
|
||||
factory BlogPostCreateCredentialsModel.fromJson(Map<String, Object?> json) => _$BlogPostCreateCredentialsModelFromJson(json);
|
||||
}
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user