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="\fixed_assets\create" class="nav-item btn btn-default ti-plus"> {{ __('fixed_assets.add_fixed_asset') }}</a>
<!-- <a href="\fixed_assets\edit" class="nav-item btn btn-default ti-pencil"> Edit Fixed Asset</a> -->
<a href="\fixed_assets" class="nav-item btn btn-default ti-pencil"> {{ __('fixed_assets.view_fixed_assets') }}</a>
<!-- <a href="#" class="nav-item btn btn-danger ti-pencil"> Delete Fixed Asset</a> -->
</div>
</div>