2 Commits

Author	SHA1	Message	Date
skeeter	71ecb0af10	Removed 'Scheduling Conflict' from template.	2001-05-17 01:14:29 +00:00
skeeter	63ad25eb12	added conflict resolution back into edit_entry_handler	2000-11-24 22:51:43 +00:00