diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2014-01-23 13:51:51 +0100 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-01-23 13:51:51 +0100 |
| commit | 4b7dfd34f8adb5db9b7e67206da384973ebdc767 (patch) | |
| tree | 77f1da31fb6b3c5501526d5c83bc2d80bdf717b7 | |
| parent | ade726ad324efb16c65055ce2dd5683c3109c8d8 (diff) | |
| download | nextcloud-server-4b7dfd34f8adb5db9b7e67206da384973ebdc767.tar.gz nextcloud-server-4b7dfd34f8adb5db9b7e67206da384973ebdc767.zip | |
fix conflicts and add missing closing tag
| -rw-r--r-- | apps/files_sharing/css/public.css | 8 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 2 |
2 files changed, 1 insertions, 9 deletions
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'])): ?> |