From b2fc55c8982d3e6b48388d9122b296f373b6bd08 Mon Sep 17 00:00:00 2001
From: anishsreenivas82 <77966360+anishsreenivas82@users.noreply.github.com>
Date: Fri, 30 Jul 2021 21:02:04 +0530
Subject: [PATCH] final

---
 lib/pages/donor_dashboard.dart | 8 ++++++++
 lib/pages/splashscreen.dart    | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/lib/pages/donor_dashboard.dart b/lib/pages/donor_dashboard.dart
index 038182e..8662b81 100644
--- 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
index f140d75..dad9dac 100644
--- 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';