resolved conflicts

This commit is contained in:
2025-03-31 03:46:05 +03:00
6454 changed files with 1520539 additions and 9 deletions
@@ -0,0 +1,8 @@
<div class="panel panel-default">
<div class="panel-body">
<a href="/diagnoses/create" class="nav-item btn btn-default ti-plus">{{ __('diagnoses.add_new_diagnosis') }}</a>
<a href="/diagnoses/edit/all" class="nav-item btn btn-default ti-pencil"> {{ __('diagnoses.edit_all_diagnoses') }}</a>
<a href="/diagnoses/" class="nav-item btn btn-default ti-pencil"> {{ __('diagnoses.view_activate_diagnoses') }}</a>
<a href="/diagnoses/inactive" class="nav-item btn btn-default ti-pencil"> {{ __('diagnoses.view_inactivate_diagnoses') }}</a>
</div>
</div>