fix conflicts and add missing closing tag

This commit is contained in:
Morris Jobke 2014-01-23 13:51:51 +01:00
parent ade726ad32
commit 4b7dfd34f8
2 changed files with 1 additions and 9 deletions

View File

@ -105,11 +105,3 @@ thead{
margin-left: 5px; margin-left: 5px;
width: 300px; width: 300px;
} }
/*.directLink label {*/
/*font-weight: normal;*/
/*}*/
/*.directLink input {*/
/*margin-left: 10px;*/
/*width: 300px;*/
/*}*/

View File

@ -16,7 +16,7 @@
<div class="header-right"> <div class="header-right">
<span id="details"><?php p($l->t('shared by %s', array($_['displayName']))) ?></span> <span id="details"><?php p($l->t('shared by %s', array($_['displayName']))) ?></span>
</div> </div>
</header> </div></header>
<div id="content"> <div id="content">
<div id="preview"> <div id="preview">
<?php if (isset($_['folder'])): ?> <?php if (isset($_['folder'])): ?>