fix conflicts and add missing closing tag

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 7bcafd542ca2e954af781f41c462cf4259454712..a5762799ac476bd3c476611be32e2a03e25fded2 100644 (file)
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -105,11 +105,3 @@ thead{
        margin-left: 5px;
        width: 300px;
 }
-
-/*.directLink label {*/
-       /*font-weight: normal;*/
-/*}*/
-/*.directLink input {*/
-       /*margin-left: 10px;*/
-       /*width: 300px;*/
-/*}*/

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index fd0e0ad6412f5ec84764f8d02ee77d3e2b5038fa..f8a31005cdfac2a7b0e3a17868537fc231bbf1a2 100644 (file)
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -16,7 +16,7 @@
                <div class="header-right">
                        <span id="details"><?php p($l->t('shared by %s', array($_['displayName']))) ?></span>
                </div>
-</header>
+</div></header>
 <div id="content">
        <div id="preview">
                <?php if (isset($_['folder'])): ?>