[mythtv] conflict resolution
Bruce Markey
bjm at lvcm.com
Thu Nov 6 18:57:37 EST 2003
Bruce Markey wrote:
> I think the comma after the quote shouldn't be there.
>
> +" subtitle VARCHAR(128) NULL, ",
> remove this ----^
Sigh. Of course, the arrow should point to the last comma.
Let's try a diff:
--- override2.orig 2003-11-06 15:54:07.000000000 -0800
+++ override2.patch 2003-11-06 15:54:38.000000000 -0800
@@ -29,7 +29,7 @@
+" starttime TIMESTAMP NOT NULL, "
+" endtime TIMESTAMP NOT NULL, "
+" title VARCHAR(128) NULL, "
-+" subtitle VARCHAR(128) NULL, ",
++" subtitle VARCHAR(128) NULL, "
+" description TEXT NULL "
+");",
+""
-- bjm
More information about the mythtv-dev
mailing list