@samitouri / QOS-React-2 / commits / 3a4e1dbb5b

Fix merge conflict in #4940

Ben Alpert committed Feb 17, 2016 at 17:20 UTC 3a4e1dbb5b2957875cab6af11a5e5934e125a0d8

1 file changed +1 -1

src/test/ReactTestUtils.js

+1 -1

@@ -458,7 +458,7 @@ ReactShallowRenderer.prototype._render = function(element, transaction, context)

458 if (this._instance) {

459 this._instance.receiveComponent(element, transaction, context);

460 } else {

461 - var instance = new ShallowComponentWrapper(element.type);

461 + var instance = new ShallowComponentWrapper(element);

462 instance.mountComponent(transaction, null, null, context);

463 this._instance = instance;

464 }