From: Morris Jobke <morris.jobke@gmail.com>
Date: Thu, 23 Jan 2014 12:51:51 +0000 (+0100)
Subject: fix conflicts and add missing closing tag
X-Git-Tag: v7.0.0alpha2~874^2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b7dfd34f8adb5db9b7e67206da384973ebdc767;p=nextcloud-server.git

fix conflicts and add missing closing tag
---

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 7bcafd542ca..a5762799ac4 100644
--- 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 fd0e0ad6412..f8a31005cdf 100644
--- 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'])): ?>