From 09c8cd17cca16e7ca9fa9d556ad8cc017cea3f44 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg.stefan.germany@googlemail.com>
Date: Sat, 20 Aug 2011 22:50:43 +0200
Subject: [PATCH] remove reset button (again)

---
 apps/calendar/templates/part.editevent.php | 9 ---------
 apps/calendar/templates/part.newevent.php  | 1 -
 2 files changed, 10 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
diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php
index d1fb6244238..823a2445c8f 100644
--- a/apps/calendar/templates/part.newevent.php
+++ b/apps/calendar/templates/part.newevent.php
@@ -112,7 +112,6 @@
 	</table>
 	<span id="newcalendar_actions">
 		<input type="button" style="float: left;" value="<?php echo $l -> t("Submit");?>">
-		<input type="button" style="float: right;" value="<?php echo $l -> t("Reset");?>">
 	</span>
 </div>
 <script type="text/javascript">