solved conflicts

2019-10-08 13:06:50 +02:00 · 2019-10-08 13:06:50 +02:00 · 90ca883962
parent 9358602471 c7d2c33ffb
commit 90ca883962
2 changed files with 2 additions and 2 deletions
--- a/modules/agency/front/location/index.html
+++ b/modules/agency/front/location/index.html
@ -22,4 +22,4 @@
            </vn-check>
        </vn-treeview>
    </vn-card>
-</div>
+</div>
--- a/modules/worker/front/department/index.html
+++ b/modules/worker/front/department/index.html
@ -44,4 +44,4 @@
        <input type="button" response="CANCEL" translate-attr="{value: 'Cancel'}"/>
        <button response="ACCEPT" translate>Create</button>
    </tpl-buttons>
-</vn-dialog>
+</vn-dialog>