bachelor/wonders
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Shawn 2024-01-18 12:14:40 -07:00
parent 4b34f81555
commit a71de46804
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/router.dart
View File

@ -72,14 +72,6 @@ final appRouter = GoRouter(
}, },
routes: [ routes: [
AppRoute(ScreenPaths.splash, (_) => Container(color: $styles.colors.greyStrong)), // This will be hidden AppRoute(ScreenPaths.splash, (_) => Container(color: $styles.colors.greyStrong)), // This will be hidden
<<<<<<< HEAD
=======
AppRoute(ScreenPaths.home, (_) => HomeScreen(), routes: [
AppRoute('collection', (s) {
return CollectionScreen(fromId: s.queryParams['id'] ?? '');
}),
]),
>>>>>>> main
AppRoute(ScreenPaths.intro, (_) => IntroScreen()), AppRoute(ScreenPaths.intro, (_) => IntroScreen()),
AppRoute(ScreenPaths.home, (_) => HomeScreen(), routes: [ AppRoute(ScreenPaths.home, (_) => HomeScreen(), routes: [
_timelineRoute, _timelineRoute,