a

anishsreenivas82 · Jul 30, 2021 · 8d7e900 · 8d7e900
1 parent b2fc55c
commit 8d7e900
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/lib/pages/donor_dashboard.dart b/lib/pages/donor_dashboard.dart
@@ -144,18 +144,11 @@ 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/volunteer_page.dart b/lib/pages/volunteer_page.dart
@@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_barcode_scanner/flutter_barcode_scanner.dart';
-import 'package:flutterlogindesign/pages/qrscan.dart';
+
 import 'package:flutterlogindesign/pages/splash_screen.dart';
 import 'package:flutterlogindesign/pages/verification.dart';