Repairing migration merge conflict

- Legacy-Id: 5423
This commit is contained in:
Robert Sparks 2013-02-04 02:34:01 +00:00
parent 8a7c5ac977
commit 33e2a0766e