From 3a4e1dbb5b2957875cab6af11a5e5934e125a0d8 Mon Sep 17 00:00:00 2001
From: Ben Alpert <balpert@fb.com>
Date: Wed, 17 Feb 2016 17:20:37 -0800
Subject: [PATCH] Fix merge conflict in #4940

---
 src/test/ReactTestUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js
index 182a7aa906..4f8e4ebb38 100644
--- a/src/test/ReactTestUtils.js
+++ b/src/test/ReactTestUtils.js
@@ -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;
   }