I removed the file in conflict from my pull request.


On Mon, Jun 3, 2013 at 1:55 PM, John Rogelstad <notifications@github.com>wrote:

> In node-datasource/routes/data.js:
>
> > @@ -15,11 +15,17 @@ regexp:true, undef:true, strict:true, trailing:true, white:true */
> >    // Sorry for the indirection.
> >
> >    /**
> > +<<<<<<< HEAD
>
> This is a conflict that needs to be resolved
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/xtuple/xtuple/pull/456/files#r4508247>
> .
>