From a75d0a9123d36086f5ca948526c6f76e4e86bb3d Mon Sep 17 00:00:00 2001 From: mso7nueh Date: Tue, 13 Aug 2024 16:35:18 +0300 Subject: [PATCH] refactor(merger): resolve merge conflict --- lib/app_router.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/app_router.dart b/lib/app_router.dart index a2e87fbe..698cf7c1 100644 --- a/lib/app_router.dart +++ b/lib/app_router.dart @@ -8,8 +8,11 @@ import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart'; import 'package:eatvio_app/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart'; import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart'; import 'package:eatvio_app/features/diary/presentation/pages/diary_screen.dart'; +import 'package:eatvio_app/features/diets/presentation/pages/about_diet_screen.dart'; +import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart'; import 'package:eatvio_app/features/feed/models/recipes_model.dart'; import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart'; +import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart'; import 'package:eatvio_app/features/recipes/presentation/pages/about_recipes_screen.dart'; import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart'; import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart';