final

anishsreenivas82 · Jul 30, 2021 · b2fc55c · b2fc55c
1 parent 22f48c9
commit b2fc55c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/pages/donor_dashboard.dart b/lib/pages/donor_dashboard.dart
@@ -144,10 +144,18 @@ class _DonorState extends State<Donor> {
                             TextButton(
                               child: const Text('View'),
                               onPressed: () {
+<<<<<<< Updated upstream
                                 Navigator.push(
                                     context,
                                     MaterialPageRoute(
                                         builder: (context) => PendingOrders()));
+=======
+                                 Navigator.push(
+                                    context,
+                                    MaterialPageRoute(
+                                        builder: (context) => PendingOrders()));
+
+>>>>>>> Stashed changes
                               },
                             ),
                             const SizedBox(width: 8),

diff --git a/lib/pages/splashscreen.dart b/lib/pages/splashscreen.dart
@@ -1,3 +1,5 @@
+// import 'dart:ffi';
+
 import 'package:flutter/material.dart';
 import 'package:flutterlogindesign/pages/signin_page.dart';
 import 'package:flutterlogindesign/pages/splash_screen.dart';