fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-11-20 23:58:20 -05:00
parent 45a58de539
commit 8fcbb60cf7