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,7 @@
<div class="panel panel-default">
<div class="panel-body">
<a href="{{ route('occupations.create') }}" class="nav-item btn btn-default ti-plus"> {{ __('occupations.add_occupation') }}</a>
<a href="{{ route('occupations.index') }}" class="nav-item btn btn-default ti-pencil"> {{ __('occupations.view_occupation') }}</a>
<a href="{{ route('occupations.inactive') }}" class="nav-item btn btn-default ti-pencil"> {{ __('occupations.activate_occupation') }}</a>
</div>
</div>