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.
PatientApp-KKUMC/lib/pages/pharmacies/widgets
hussam al-habibeh 1a382bfc80 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix
 Conflicts:
	lib/config/config.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-page/cart-order-page.dart
	lib/pages/pharmacies/screens/product-details/product-detail.dart
	lib/pages/sub_categorise_page.dart
4 years ago
..
home Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
ProductOrderItem.dart fixed issues 4 years ago
ProductOrderPreviewItem.dart fix merge issues 5 years ago
ProductTileItem.dart fixed issues 4 years ago
lacum-banner-widget.dart pharmacy fixes 4 years ago
lakum-banner-widget.dart fix merge issues 5 years ago
lakum-point-table-row-widget.dart Imports organized 4 years ago
lakum_point_table_row_widget.dart Imports organized 4 years ago
manufacturerItem.dart fix bugs pharmacy home and increase performance 4 years ago