From bf52b6b3640f89d570f2b73693718d98d6efebe8 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Sat, 10 Sep 2011 11:44:51 +0200 Subject: fix --- application/views/scripts/event/index.phtml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'application') diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index b13f035..cea191e 100644 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -161,12 +161,7 @@ var selectedEvent = null; // keydown variable */ eventSelected(event); -<<<<<<< HEAD - - pressKey(event); -======= ->>>>>>> d6293f80fbeb34f466663bd011e29827123255c1 - + }, select: function( startDate, endDate, allDay, jsEvent, view ) { @@ -176,7 +171,6 @@ var selectedEvent = null; // keydown variable }else { self.location="/event/add/evstart/" + startDate + "/evend/" + endDate; } - }, eventResize: function( event, dayDelta, minuteDelta, revertFunc ) { -- cgit v1.2.3-55-g7522