fix merge conflicts

diff --cc apps/calendar/ajax/changeview.php
index 707c8c59ebf8338e3eb8c9423d3c2c134fb16f78,76e29cbe2659a9206d9a4526407fb52b5ab763ca..736a5625530da0de445eadf9bb61090e64eb818b
--- 1/apps/calendar/ajax/changeview.php
--- 2/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@@ -5,8 -5,8 +5,6 @@@
   * later.
   * See the COPYING-README file.
   */
--
-  
 -require_once ('../../../lib/base.php');
  OC_JSON::checkLoggedIn();
  OC_JSON::checkAppEnabled('calendar');
  $view = $_GET['v'];

diff --cc apps/calendar/ajax/event/delete.php
Simple merge

diff --cc apps/calendar/ajax/event/edit.form.php
Simple merge

diff --cc apps/calendar/ajax/event/edit.php
Simple merge

diff --cc apps/calendar/ajax/event/move.php
Simple merge

diff --cc apps/calendar/ajax/event/new.form.php
Simple merge

diff --cc apps/calendar/ajax/event/resize.php
Simple merge

diff --cc apps/calendar/ajax/events.php
index 0cfee0dbdc10e3c48fd0c076b94d1b0427abc917,3c990422f0cd636e9dc1fd57043b7744bc2ca986..3aa487fd2310d23f6ab194048376b70a5340f746
--- 1/apps/calendar/ajax/events.php
--- 2/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@@ -6,25 -6,8 +6,8 @@@
   * See the COPYING-README file.
   */
  
 -require_once ('../../../lib/base.php');
 + 
  require_once('when/When.php');
- $l = OC_L10N::get('calendar');
- $unnamed = $l->t('unnamed');
- function create_return_event($event, $vevent){
-       $return_event = array();
-       global $unnamed;
-       $return_event['id'] = (int)$event['id'];
-       $return_event['title'] = htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: $unnamed);
-       $return_event['description'] = isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'';
-       $last_modified = $vevent->__get('LAST-MODIFIED');
-       if ($last_modified){
-               $lastmodified = $last_modified->getDateTime()->format('U');
-       }else{
-               $lastmodified = 0;
-       }
-       $return_event['lastmodified'] = (int)$lastmodified;
-       return $return_event;
- }
  
  OC_JSON::checkLoggedIn();
  OC_JSON::checkAppEnabled('calendar');

diff --cc apps/calendar/ajax/import/import.php
index 95294948f753d5091dc7c76b593f0bd33f618609,4d5e7340aefd4821043793469224b69767f8d46c..5848cac448d102d64ebffab38bd7ca976d2e11cd
--- 1/apps/calendar/ajax/import/import.php
--- 2/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@@ -7,11 -7,12 +7,11 @@@
   */
  //check for calendar rights or create new one
  ob_start();
-  
 -require_once ('../../../../lib/base.php');
  OC_JSON::checkLoggedIn();
  OC_Util::checkAppEnabled('calendar');
- $nl = "\n\r";
- $progressfile = OC::$APPSROOT . '/apps/calendar/import_tmp/' . md5(session_id()) . '.txt';
+ $nl="\r\n";
+ $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
+ $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
  if(is_writable('import_tmp/')){
        $progressfopen = fopen($progressfile, 'w');
        fwrite($progressfopen, '10');

diff --cc apps/calendar/ajax/share/changepermission.php
Simple merge

diff --cc apps/calendar/ajax/share/share.php
Simple merge

diff --cc apps/calendar/ajax/share/unshare.php
Simple merge

diff --cc apps/calendar/export.php
Simple merge

diff --cc apps/calendar/index.php
Simple merge

diff --cc apps/contacts/ajax/savecrop.php
Simple merge

diff --cc apps/files/templates/admin.php
index 9bcc40e9361c2f9f11c54a7bd9239de0f6bb31bc,0000000000000000000000000000000000000000..01fe110526085c9027df0e9c9c4de696ba58ed46
mode 100644,000000..100644
--- 1/apps/files/templates/admin.php
--- /dev/null
+++ b/apps/files/templates/admin.php
@@@ -1,15 -1,0 +1,19 @@@
-               <fieldset class="personalblock">
-                       <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files:' ); ?> </label><input name="maxZipInputSize" id="maxZipInputSize" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> /><br/>
-               </fieldset>
 +<?php OC_Util::addScript('files','admin'); ?>
 +
 +<form name="filesForm" action='#' method='post'>
 +      <fieldset class="personalblock">
 +              <legend><strong><?php echo $l->t('File handling');?></strong></legend>
 +              <?php if($_['htaccessWorking']):?>
 +                      <label for="maxUploadSize"><?php echo $l->t( 'Maximum upload size' ); ?> </label><input name='maxUploadSize' id="maxUploadSize" value='<?php echo $_['uploadMaxFilesize'] ?>'/>(<?php echo $l->t('max. possible: '); echo $_['maxPossibleUploadSize'] ?>)<br/>
 +              <?php endif;?>
 +              <input type="checkbox" name="allowZipDownload" id="allowZipDownload" value="1" title="<?php echo $l->t( 'Needed for multi-file and folder downloads.' ); ?>"<?php if ($_['allowZipDownload']) echo ' checked="checked"'; ?> /> <label for="allowZipDownload"><?php echo $l->t( 'Enable ZIP-download' ); ?></label> <br/>
++
++                      <input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> />
++                      <label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
++
 +              <input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/>
 +      </fieldset>
 +</form>
++
++
++