You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Sultan khan a4ed832147 Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6 ... # Conflicts: # lib/config/config.dart # lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart # lib/pages/BookAppointment/BookSuccess.dart # lib/pages/Covid-DriveThru/covid-payment-summary.dart # lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart # lib/pages/ErService/AmbulanceRequestIndexPages/PickupLocation.dart # lib/pages/ErService/AmbulanceRequestIndexPages/SelectTransportationMethod.dart # lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart # lib/pages/ErService/OrderLogPage.dart # lib/pages/ErService/rapid-response-team/rrt-request-page.dart # lib/pages/ToDoList/ToDo.dart # lib/pages/livecare/widgets/clinic_list.dart # lib/pages/medical/balance/confirm_payment_page.dart # lib/services/payfort_services/payfort_service.dart # lib/services/payfort_services/payfort_view_model.dart # lib/splashPage.dart # pubspec.yaml		2 years ago
..
Covid-TimeSlots.dart	fixes	2 years ago
covid-dirvethru-questions.dart	changes	2 years ago
covid-drivethru-location.dart	updates.	2 years ago
covid-payment-alert.dart	models updates -> 3.13.6	2 years ago
covid-payment-details.dart	models updates -> 3.13.6	2 years ago
covid-payment-summary.dart	Merge branch 'development_v3.3' of http://34.17.52.79/Haroon6138/diplomatic-quarter into dev_v3.13.6	2 years ago