#
# ChangeLog for trunk/calendar/templates/default/conflict.tpl
# 
# Generated by Trac 0.12.2
# 08/01/24 00:17:24
 
Mon, 18 Apr 2011 14:06:31 GMT niltonneto [4060]
	* trunk (copied)

	Ticket #000 - Marco zero para novo processo de desenvolvimento.


Tue, 14 Sep 2010 19:15:11 GMT rafaelraymundo [3241]
	* branches/2.2/calendar/templates/default/conflict.tpl (added)

	Ticket #816 - Arquivo necessario, no caso de conflitos com
	agendamentos.