Fix merge conflict in #4940

This commit is contained in:
Ben Alpert
2016-02-17 17:20:37 -08:00
parent 62e9531023
commit 3a4e1dbb5b
+1 -1
View File
@@ -458,7 +458,7 @@ ReactShallowRenderer.prototype._render = function(element, transaction, context)
if (this._instance) {
this._instance.receiveComponent(element, transaction, context);
} else {
var instance = new ShallowComponentWrapper(element.type);
var instance = new ShallowComponentWrapper(element);
instance.mountComponent(transaction, null, null, context);
this._instance = instance;
}