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.
diplomatic-quarter/lib/core/service/parmacyModule
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
..
lacum-registration-service.dart fix merge issues 5 years ago
lacum-service.dart fix merge issues 5 years ago
lacum-transfer-service.dart fix merge issues 5 years ago
order-preview-service.dart Merge branch 'development' into ZohaibIqbalKambrani 5 years ago
parmacy_module_service.dart pharmacy fixes 5 years ago
prescription_service.dart Merge branch 'development' into pharmacy-Fatima 5 years ago
terms-condition-service.dart fix merge issues 5 years ago