conflict resolved

2014-02-06 03:02:04 +01:00 · 2014-02-06 03:02:04 +01:00 · 0114144300
parent 91536c9299 d1e1abeb26
commit 0114144300
1 changed files with 1 additions and 0 deletions
--- a/js/calendar.js
+++ b/js/calendar.js
@ -234,6 +234,7 @@ Calendar={
 				},"json");
 		},
 		moveEvent:function(event, dayDelta, minuteDelta, allDay, revertFunc){
+
      // nothing to do for link-shared public calendars
      if (Calendar.UI.isLinkShared()) return false;