diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-08-31 09:41:07 +0200 |
| commit | e9462ba14529b7172ba5a21e7985d24de91faa37 (patch) | |
| tree | c2270ca2975f6683a361c5959894b6bbc954475d /view/tpl/filer_dialog.tpl | |
| parent | 2b9322fc7d879fecbe334083bbd028538c985c54 (diff) | |
| parent | b775a1aa0e36a74f0f937d85f458fd12af18a264 (diff) | |
| download | volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.gz volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.tar.bz2 volse-hubzilla-e9462ba14529b7172ba5a21e7985d24de91faa37.zip | |
resolve merge conflict
Diffstat (limited to 'view/tpl/filer_dialog.tpl')
| -rwxr-xr-x | view/tpl/filer_dialog.tpl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl index ae59ab713..71e075958 100755 --- a/view/tpl/filer_dialog.tpl +++ b/view/tpl/filer_dialog.tpl @@ -1,4 +1,6 @@ +<div class="item-filer-dialog"> {{include file="field_combobox.tpl"}} <div class="settings-submit-wrapper" > <input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" /> </div> +</div> |