#
# ChangeLog for sandbox/3.0/calendar/templates/default/conflict.tpl
# 
# Generated by Trac 0.12.2
# 09/17/24 12:14:40
 
Mon, 16 Aug 2010 18:46:05 GMT niltonneto [3159]
	* sandbox/3.0 (copied)

	Ticket #1161 - Cópia para implantar novo modelo de utilização do SVN.


Thu, 11 Mar 2010 19:44:45 GMT eduardoalex [2227]
	* trunk/calendar/templates/classic/conflict.tpl (added)
	* trunk/calendar/templates/default/conflict.tpl (added)

	Ticket #816 - Adicionado os arquivos conflict.tpl para correcao do ...