mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Fix merge conflict in #4940
This commit is contained in:
1 parent
62e9531023
commit
3a4e1dbb5b
1 file changed
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user