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.
HMG_Patient_App/lib
haroon amjad 925e3cb686 Merge branch 'development' into haroon-new-design
# Conflicts:
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/landing_page_pharmcy.dart
#	lib/pages/login/login.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/screens/product-details/product-detail.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacy/profile/profile.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
4 years ago
..
analytics
config Registration fix 4 years ago
core Merge branch 'development' into haroon-new-design 4 years ago
extensions Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
generated/json Imports organized 4 years ago
models Body added 4 years ago
pages Merge branch 'development' into haroon-new-design 4 years ago
services Merge branch 'development' into haroon-new-design 4 years ago
theme Fixes & code optimizations 4 years ago
uitl Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
widgets Merge branch 'development' into haroon-new-design 4 years ago
Constants.dart
d_q_icons_icons.dart add pharmacy icons for bottom nav 4 years ago
locator.dart Merge branch 'development' into development_new_design_2.0 4 years ago
main.dart Merge branch 'development' into haroon-new-design 4 years ago
routes.dart Packages and Offers apply token 4 years ago
splashPage.dart Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago