diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e6bbdf39..4d4e663f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -60,9 +60,8 @@ -<<<<<<< HEAD + -======= ->>>>>>> edd850490ef9ccdee72c9e8d3318f88be0677dce + diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index bd17fcd1..05cb0f8b 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:http/http.dart' as http;