fix conflicts

This commit is contained in:
Daniela Arcese 2017-06-23 12:10:53 -04:00
parent e4fafc7472
commit 4dadec5ae9
3 changed files with 128 additions and 74 deletions

View file

@ -38,12 +38,19 @@
<div id="file-list">
<table id="uploaded-files">
<tr>
<th width="30%">File</th>
<th width="45%">Copy URL</th>
<th width="18%">Expires in</th>
<th width="7%">Delete</th>
</tr>
<thead>
<tr>
<!-- htmllint attr-bans="false" -->
<th width="30%">File</th>
<th width="45%">Copy URL</th>
<th width="18%">Expires in</th>
<th width="7%">Delete</th>
<!-- htmllint tag-bans="$previous" -->
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>