From d45b8f75f4fc141beafc187061dacec46a99aa8f Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 10 Mar 2010 13:04:28 -0500
Subject: [PATCH] revert another incorrect conflict resolution

---
 kronolith/js/kronolith.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
index 93974de2a..b92e64a06 100644
--- a/kronolith/js/kronolith.js
+++ b/kronolith/js/kronolith.js
@@ -2233,11 +2233,8 @@ KronolithCore = {
 
             switch (type) {
             case 'internal':
-                $('kronolithCalendarinternalDescription').setValue(info.desc);
-                $('kronolithCalendarinternalLinkImportExport').up('span').show();
-                $('kronolithCalendarinternalExport').href = Kronolith.conf.URI_CALENDAR_EXPORT + '=' + calendar;
                 kronolithCTagAc.reset(Kronolith.conf.calendars.internal[calendar].tg);
-                break;
+                // fall through
             case 'tasklists':
                 $('kronolithCalendar' + type + 'Description').setValue(info.desc);
                 $('kronolithCalendar' + type + 'LinkImportExport').up('span').show();
-- 
2.11.0