Fix merge conflict.
authorBen Thompson <ben@xtuple.com>
Tue, 13 May 2014 17:58:41 +0000 (13:58 -0400)
committerBen Thompson <ben@xtuple.com>
Tue, 13 May 2014 17:58:41 +0000 (13:58 -0400)
commit769fc23d51b8052e14b4403c701a9bbf3263554d
treecf993a941b43d99e819aeed745da6098db776369
parentee55fc7dc5a65bc0e5080d0d7461e070cb251fa7
parent6f3ad3f356419fb98c6066a08d97fcd1f299fc65
Fix merge conflict.
enyo-client/database/source/xm/javascript/item_site.sql
lib/orm/source/xm/javascript/model.sql