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('general_items.create') }}" class="nav-item btn btn-default ti-plus"> {{ __('general_items.add_general_items') }}</a>
<a href="{{ route('general_items.index') }}" class="nav-item btn btn-default ti-pencil"> {{ __('general_items.view_general_items') }}</a>
<a href="{{ route('general_items.inactive') }}" class="nav-item btn btn-default ti-pencil"> {{ __('general_items.activate_general_items') }}</a>
</div>
</div>