diff options
| author | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-08-20 22:50:43 +0200 |
|---|---|---|
| committer | Georg Ehrke <georg.stefan.germany@googlemail.com> | 2011-08-20 22:50:43 +0200 |
| commit | 09c8cd17cca16e7ca9fa9d556ad8cc017cea3f44 (patch) | |
| tree | ab26ef855bc1a4410c870300e118ee2606a1d4a5 /apps/calendar/templates/part.editevent.php | |
| parent | 3cb07254e518679028d7f7ce1f07fdbed808106a (diff) | |
| download | nextcloud-server-09c8cd17cca16e7ca9fa9d556ad8cc017cea3f44.tar.gz nextcloud-server-09c8cd17cca16e7ca9fa9d556ad8cc017cea3f44.zip | |
remove reset button (again)
Diffstat (limited to 'apps/calendar/templates/part.editevent.php')
| -rw-r--r-- | apps/calendar/templates/part.editevent.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php index 179903170d1..8a85652442c 100644 --- a/apps/calendar/templates/part.editevent.php +++ b/apps/calendar/templates/part.editevent.php @@ -95,12 +95,7 @@ </tr> </table> <span id="editevent_actions"> -<<<<<<< HEAD <input type="button" style="float: left;" value="<?php echo $l -> t("Submit");?>"> - <input type="button" style="float: right;" value="<?php echo $l -> t("Reset");?>"> -======= - <input type="button" value="<?php echo $l -> t('Submit');?>"> ->>>>>>> b3f6eb22249408e927c8c83e66d60d2aba52ccaf </span> </div> <script type="text/javascript"> @@ -135,8 +130,4 @@ document.getElementById("totime").style.color = "#A9A9A9"; } } -<<<<<<< HEAD </script> -======= -</script> ->>>>>>> b3f6eb22249408e927c8c83e66d60d2aba52ccaf |