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,6 @@
<div class="panel panel-default">
<div class="panel-body">
<a href="{{ route('journals') }}" class="nav-item btn btn-success" style="border-radius: 5px;"><i class="fa fa-plus"></i> <span style="margin-left: 5px">{{ __('finance.journals') }}</span></a>
<a href="{{ route('journals.records') }}" class="nav-item btn btn-success" style="border-radius: 5px;"><i class="fa fa-plus"></i> <span style="margin-left: 5px">{{ __('finance.past_records') }}</span></a>
</div>
</div>