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