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
devmirza121 a131f24952 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart
#	lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart
#	lib/pages/AlHabibMedicalService/health_calculator/ideal_body/ideal_body.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
..
analytics merge changes-4 5 years ago
config Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
core Product detail page updates 4 years ago
extensions Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
generated/json Offers & discounts UI updating 4 years ago
models Product detail page updates 4 years ago
pages Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
services Product detail page updates 4 years ago
theme Fixes & code optimizations 4 years ago
uitl Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
widgets Offers & discounts UI updating 4 years ago
Constants.dart code merged 5 years ago
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 pharmacy fixes 4 years ago
splashPage.dart Merge branch 'new_design_sikander' into development_new_design_2.0 5 years ago