From ec097218696f8e523e5d4e640d0a1486a1c50621 Mon Sep 17 00:00:00 2001
From: Mohammad Aljammal <jammal@unicode.ai>
Date: Tue, 4 Aug 2020 16:46:54 +0300
Subject: [PATCH] fix merge issues

---
 lib/core/viewModels/medical/prescriptions_view_model.dart | 2 ++
 lib/pages/landing/landing_page.dart                       | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/core/viewModels/medical/prescriptions_view_model.dart b/lib/core/viewModels/medical/prescriptions_view_model.dart
index 75ff319f..6ad25380 100644
--- a/lib/core/viewModels/medical/prescriptions_view_model.dart
+++ b/lib/core/viewModels/medical/prescriptions_view_model.dart
@@ -123,4 +123,6 @@ class PrescriptionsViewModel extends BaseViewModel {
       setState(ViewState.Idle);
     }
   }
+
+
 }
diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart
index df83f1d6..8e8f84e4 100644
--- a/lib/pages/landing/landing_page.dart
+++ b/lib/pages/landing/landing_page.dart
@@ -1,12 +1,7 @@
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
-import 'package:diplomaticquarterapp/config/size_config.dart';
 import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart';
 import 'package:diplomaticquarterapp/pages/ToDoList/ToDo.dart';
-import 'package:diplomaticquarterapp/pages/landing/replay_page.dart';
 import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
-import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart';
-import 'package:diplomaticquarterapp/providers/auth_provider.dart';
-import 'package:diplomaticquarterapp/pages/pharmacies/medicine_search_screen.dart';
 import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart';
 import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';