----------------------------------------------------------------------------
Changes committed by ijr on Tue Jul 23 23:20:26 2002
Added Files:
in MC/programdb:
conflictupdate.sql
Modified Files:
in MC/mythfrontend:
viewscheduled.cpp
in MC/programdb:
conflict.sql mc.sql
Log Message:
Fix the conflict resolution bug.
----------------------------------------------------------------------------
Changes committed by ijr on Tue Jul 23 23:20:26 2002
Added Files:
in MC/programdb:
conflictupdate.sql
Modified Files:
in MC/mythfrontend:
viewscheduled.cpp
in MC/programdb:
conflict.sql mc.sql
Log Message:
Fix the conflict resolution bug.
----------------------------------------------------------------------------