diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:26:55 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 22:26:55 +0200 |
| commit | dc18e65b4675d1d458a42ef8e6125bf6680ba157 (patch) | |
| tree | 30072917dd3290cd65a8cfac764feb26e56594c1 /apps/calendar/appinfo | |
| parent | 8ddea7e95cc19e7880f2334e2c8d43b8c4e02ee0 (diff) | |
| parent | 12818093007d5bdce5519b5015e2a0748c98e24d (diff) | |
| download | nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.tar.gz nextcloud-server-dc18e65b4675d1d458a42ef8e6125bf6680ba157.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/appinfo')
| -rw-r--r-- | apps/calendar/appinfo/app.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php index c895be82838..21d128e7b8a 100644 --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -8,7 +8,6 @@ OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php'; OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php'; OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser'); -OC_Hook::connect('OC_DAV', 'initialize', 'OC_Calendar_Hooks', 'initializeCalDAV'); OC_Util::addScript('calendar','loader'); OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min"); OC_Util::addStyle("3rdparty", "chosen/chosen"); @@ -23,5 +22,4 @@ OC_App::addNavigationEntry( array( 'icon' => OC_Helper::imagePath( 'calendar', 'icon.svg' ), 'name' => $l->t('Calendar'))); OC_App::registerPersonal('calendar', 'settings'); -OC_Search::registerProvider('OC_Search_Provider_Calendar'); - +OC_Search::registerProvider('OC_Search_Provider_Calendar');
\ No newline at end of file |