Done.


On Thu, Jun 27, 2013 at 6:44 AM, John Rogelstad <notifications@github.com>wrote:

> In enyo-client/database/orm/models/sales_order.json:
>
> > @@ -996,6 +996,8 @@
> >      "table": "xt.coiteminfo",
> >      "idSequenceName": "coitem_coitem_id_seq",
> >      "comment": "Sales Order Line Item Map",
> > +<<<<<<< HEAD
> > +=======
>
> Need to take care of these conflicts.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/xtuple/xtuple/pull/528/files#r4914653>
> .
>