Merge pull request #6177 from yuanyan/patch-1

Remove dead code.
facebook · Mar 5, 2016 · 3b86cb1 · 3b86cb1
2 parents 1dc705a + 45a321d
commit 3b86cb1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/renderers/shared/reconciler/ReactCompositeComponent.js b/src/renderers/shared/reconciler/ReactCompositeComponent.js
@@ -630,7 +630,7 @@ var ReactCompositeComponentMixin = {
     if (this._pendingElement != null) {
       ReactReconciler.receiveComponent(
         this,
-        this._pendingElement || this._currentElement,
+        this._pendingElement,
         transaction,
         this._context
       );