fix merge conflicts

diff --cc apps/calendar/appinfo/app.php
index 22b91a41efea44626209e44ba511eb34cb34d07d,c9e0f14d7a584c54c12d741fc426f53e375cc61c..3c8cc76133e5976f9219dd53c0ea6993ff44f5e6
--- 1/apps/calendar/appinfo/app.php
--- 2/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@@ -8,8 -8,9 +8,10 @@@ OC::$CLASSPATH['OC_Connector_Sabre_CalD
  OC::$CLASSPATH['OC_Calendar_Repeat'] = 'apps/calendar/lib/repeat.php';
  OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php';
  OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php';
 +OC::$CLASSPATH['OC_Calendar_Export'] = 'apps/calendar/lib/export.php';
+ //General Hooks
  OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
+ //Repeating Events Hooks
  OCP\Util::connectHook('OC_Calendar', 'addEvent', 'OC_Calendar_Repeat', 'generate');
  OCP\Util::connectHook('OC_Calendar', 'editEvent', 'OC_Calendar_Repeat', 'update');
  OCP\Util::connectHook('OC_Calendar', 'deleteEvent', 'OC_Calendar_Repeat', 'clean');