Commit b406d73d authored by Brent Vatne's avatar Brent Vatne
Browse files

Merge pull request #84 from jim-lake/master

video breaks on react-native 0.9.0-rc
parents 28d48285 cd555535
Loading
Loading
Loading
Loading
+1 −1
Changes for Video.ios.js: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ var Video = React.createClass({
      resizeMode = NativeModules.VideoManager.ScaleNone;
    }

    var nativeProps = merge(this.props, {
    var nativeProps = merge({},this.props, {
      style,
      resizeMode: resizeMode,
      src: {