Solve merge conflict
@@ -79,46 +79,3 @@ License
Plyer is released under the terms of the MIT License. Please refer to the
LICENSE file.
-||||||| merged common ancestors
-================================== ============= ============= === ======= === =====
-Platform Android < 4.0 Android > 4.0 iOS Windows OSX Linux
-================================== ============= ============= === ======= === =====
-Accelerometer X X X X X
-Gravity X X
-Camera (taking picture) X X
-GPS X X X
-Notifications X X X X X
-Text to speech X X X X X X
-Email (open mail client) X X X X X X
-Vibrator X X
-Sms (send messages) X X
-Compass X X X
-Unique ID (IMEI or SN) X X X X X X
-Gyroscope X X X
-Battery X X X X X X
-Native file chooser X X X
-Orientation X X
-Audio recording X X
-================================== ============= ============= === ======= === =====
-=======
-================================== ============= ============= === ======= === =====
-Platform Android < 4.0 Android > 4.0 iOS Windows OSX Linux
-================================== ============= ============= === ======= === =====
-Accelerometer X X X X X
-Gravity X X
-Camera (taking picture) X X
-GPS X X X
-Notifications X X X X X
-Text to speech X X X X X X
-Email (open mail client) X X X X X X
-Vibrator X X
-Sms (send messages) X X
-Compass X X X
-Unique ID (IMEI or SN) X X X X X X
-Gyroscope X X X
-Battery X X X X X X
-Native file chooser X X X
-Orientation X X
-Audio recording X X
-================================== ============= ============= === ======= === =====
->>>>>>> update readme
