fix conflicts and add missing closing tag

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;*/
-/*}*/

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'])): ?>