Fix conflict.

This commit is contained in:
Taylor Otwell 2013-12-11 08:17:46 -06:00
commit 3053d486e6