[mythtv] conflict resolution

[David Engel]

On Sat, Nov 08, 2003 at 07:15:21PM -0800, Bruce Markey wrote:
> Anyway, I don't think there is any point to debugging the
> current pruning problems. The norecord status stuff does

I agree.

> depicting what will and won't be recorded. I'm all for
> checking this in as soon as the recorddups issue is resolved.

recorddups is resolved [crossing fingers] and it and record overrides
just went into cvs.

David
-- 
David Engel
dlengel at attbi.com