[mythtv] conflict resolution

[David Engel]

On Thu, Nov 06, 2003 at 03:27:40PM -0800, Bruce Markey wrote:
> I think the comma after the quote shouldn't be there.
> 
> +"   subtitle VARCHAR(128) NULL, ",
>                  remove this ----^

Damn!  That's what I get for trying to fix it by hand instead of just
applying your patch.

> Also, you should probably detabify your stuff for Isaac.

Isaac always does a good job of doing that himself!  Besides, if
everyone set their tabs to 8 spaces, like God intended, there wouldn't
be any problems. :)

David
-- 
David Engel
dlengel at attbi.com