Merge remote-tracking branch 'origin/faiz_dev' into faiz_development

# Conflicts:
#	lib/view_models/dashboard_view_model.dart
aamir_dev
Faiz Hashmi 2 years ago
commit 272760bad3

@ -1,6 +1,4 @@
import 'dart:io';
import 'package:car_provider_app/config/provider_routes.dart';
import 'package:car_provider_app/views/settings/branch/dealer/widget/add_phone_num_wiget.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:easy_localization/easy_localization.dart';
@ -17,7 +15,6 @@ import 'package:provider/provider.dart';
import 'package:mc_common_app/services/firebase_service.dart';
import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/utils/location/Location.dart';
import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/utils/shared_prefrence.dart';
import 'package:mc_common_app/utils/utils.dart';
import 'package:mc_common_app/view_models/ad_view_model.dart';

Loading…
Cancel
Save