Resolve merge conflict
This commit is contained in:
parent
8ce5cbe943
commit
c178cbdc12
|
@ -27,9 +27,12 @@
|
|||
<tbody>
|
||||
<tr>
|
||||
<td class="add-text"></td>
|
||||
<td align="right">
|
||||
<button class="never-save link"></button>
|
||||
</td>
|
||||
<td align="right" class="add-buttons">
|
||||
<button type="button" class="never-save link"></button>
|
||||
<button type="button" class="add-save"></button>
|
||||
<select class="select-folder"></select>
|
||||
<button class="add-save"></button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
Loading…
Reference in New Issue