fix merge conflicts

diff --cc apps/files_sharing/public.php
Simple merge

diff --cc apps/files_trashbin/lib/trash.php
Simple merge

diff --cc apps/files_trashbin/templates/part.list.php
index 71b9a238823fc45cd64bcef2a908fc1982fa2354,254b08dd36a31e39d0a289ef35e7ded6547fa255..6c6d2162846633877641df91247bf7174695955f
--- 1/apps/files_trashbin/templates/part.list.php
--- 2/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@@ -22,14 -22,10 +22,14 @@@
                data-dirlisting=0
                <?php endif; ?>>
                <td class="filename svg"
-               <?php if($file['type'] == 'dir'): ?>
+               <?php if($file['type'] === 'dir'): ?>
                        style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
                <?php else: ?>
 -                      style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 +                              <?php if(\OCP\Preview::isMimeSupported($file['mimetype'])): ?>
 +                              style="background-image:url(<?php print_unescaped(OCA\Files_Trashbin\Trashbin::preview_icon(!$_['dirlisting'] ? ($file['name'].'.d'.$file['timestamp']) : ($file['directory'].'/'.$file['name']))); ?>)" class="preview-icon"
 +                              <?php else: ?>
 +                              style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
 +                              <?php endif; ?>
                <?php endif; ?>
                        >
                <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>

diff --cc config/config.sample.php
index 50dec9e421e8d947d6b4b1593e41484aa119af56,24ba541ac5c8d5f268df6b66db305a0aafc42bb4..86bc20b714e09d856244da4360b999edd64565bc
--- 1/config/config.sample.php
--- 2/config/config.sample.php
+++ b/config/config.sample.php
@@@ -187,13 -190,6 +190,15 @@@ $CONFIG = array
  'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android
  'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8
  
 -'logdateformat' => 'F d, Y H:i:s'
 +// PREVIEW
 +/* the max width of a generated preview, if value is null, there is no limit */
 +'preview_max_x' => null,
 +/* the max height of a generated preview, if value is null, there is no limit */
 +'preview_max_y' => null,
 +/* the max factor to scale a preview, default is set to 10 */
 +'preview_max_scale_factor' => 10,
 +/* custom path for libreoffice / openoffice binary */
 +'preview_libreoffice_path' => '/usr/bin/libreoffice',
+ // date format to be used while writing to the owncloud logfile
++'logdateformat' => 'F d, Y H:i:s',
  );