fix merge issues

merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
parent b4b33be3e9
commit 22de043892

@ -60,9 +60,8 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<<<<<<< HEAD
<uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
=======
>>>>>>> edd850490ef9ccdee72c9e8d3318f88be0677dce
</manifest>

@ -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;

Loading…
Cancel
Save