egroupware_official/calendar/templates/default/overlap.tpl

<!-- $Id$ -->
<!-- BEGIN overlap -->
<center><br>
<table>
 <tr><td>{overlap_text}</td></tr>
 <tr><td><ul>{overlap_list}</ul></td></tr>
 <tr><td>
  <table cellspacing="5"><tr>
   <td>{resubmit_button}</td>
   <td>{reedit_button}</td>
  </tr></table>
 </td></tr>
</table>
</center>
<!-- END overlap -->
added conflict resolution back into edit_entry_handler 2000-11-24 23:51:43 +01:00			`<!-- $Id$ -->`
			`<!-- BEGIN overlap -->`
imported changes from .16 (app-header & styleguide-conformace) 2003-04-21 13:00:53 +02:00			`<center><br>`
added conflict resolution back into edit_entry_handler 2000-11-24 23:51:43 +01:00			`<table>`
			`<tr><td>{overlap_text}</td></tr>`
			`<tr><td><ul>{overlap_list}</ul></td></tr>`
imported changes from .16 (app-header & styleguide-conformace) 2003-04-21 13:00:53 +02:00			`<tr><td>`
			`<table cellspacing="5"><tr>`
			`<td>{resubmit_button}</td>`
			`<td>{reedit_button}</td>`
			`</tr></table>`
			`</td></tr>`
added conflict resolution back into edit_entry_handler 2000-11-24 23:51:43 +01:00			`</table>`
			`</center>`
			`<!-- END overlap -->`