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.
car_customer_app/lib
FaizHashmiCS22 83287f3b37 Merge branch 'faiz_development' of http://34.17.52.79/Haroon6138/car_customer_app into faiz_development
 Conflicts:
	lib/config/customer_routes.dart
	lib/repositories/provider_repo.dart
	lib/view_models/appointments_view_model.dart
	lib/view_models/providers_view_model.dart
	lib/views/dashboard/fragments/branches_fragment.dart
	lib/views/dashboard/fragments/providers_fragment.dart
	lib/views/provider/branch_detail_page.dart
	lib/views/provider/provider_profile_page.dart
	pubspec.yaml
3 years ago
..
config Merge branch 'faiz_development' of http://34.17.52.79/Haroon6138/car_customer_app into faiz_development 3 years ago
repositories
view_models
views Merge branch 'faiz_development' of http://34.17.52.79/Haroon6138/car_customer_app into faiz_development 3 years ago
main.dart Merge branch 'faiz_development' of http://34.17.52.79/Haroon6138/car_customer_app into faiz_development 3 years ago