From 982019fd1cfdb53dc18b3d0b31d74cd1b4092075 Mon Sep 17 00:00:00 2001
From: Rafael Pinto <raprp@posteo.de>
Date: Wed, 6 Jun 2018 04:36:55 +0100
Subject: [PATCH] Fixed readme conflict

---
 README.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 26014b67..48fe27be 100644
--- a/README.md
+++ b/README.md
@@ -184,13 +184,6 @@ using System.Collections.Generic;
        ref={(ref) => {
          this.player = ref
        }}                                      // Store reference
-       rate={1.0}                              // 0 is paused, 1 is normal.
-       volume={1.0}                            // 0 is muted, 1 is normal.
-       stereoPan={0}                           // [Android only] The audio player’s stereo pan position. A value of –1.0 is full left, 0.0 is center, and 1.0 is full right. Default 0.0
-       muted={true|false}                      // Mutes the audio entirely. Default false
-       paused={true|false}                     // Pauses playback entirely. Default false
-       resizeMode="cover"                      // Fill the whole screen at aspect ratio.*
-       repeat={true|false}                     // Repeat forever. Default false
        playInBackground={true|false}           // Audio continues to play when app entering background. Default false
        playWhenInactive={true|false}           // [iOS] Video continues to play when control or notification center are shown. Default false
        onBuffer={this.onBuffer}                // Callback when remote video is buffering
@@ -352,6 +345,14 @@ Adjust the volume.
 
 Platforms: all
 
+#### stereoPan
+The audio player’s stereo pan position.  Any value between –1.0 and 1.0 is accepted.
+* **-1.0** - Full left
+* **0.0 (default)** - Center
+* **1.0** - Full right
+
+Platforms: Android
+
 ### Additional props
 
 To see the full list of available props, you can check the [propTypes](https://github.com/react-native-community/react-native-video/blob/master/Video.js#L246) of the Video.js component.