Merge branch 'atie' into 'main'

update

See merge request online-sistem1/lelong!207
This commit is contained in:
Nur Izzati Zulkifli
2022-09-26 01:33:28 +00:00
-18
View File
@@ -28,24 +28,6 @@
<a class="dropdown-item" href="{{ route('editprofile') }}">
<i class="far fa fa-user"></i>{{ __('Profile') }}
</a>
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
=======
</div>
<div class="dropdown-item">
{{-- <a class="far fa fa-key" href="tukarkatalaluan">Tukar Katalaluan</a> --}}
<a class="dropdown-item" href="{{ route('changePasswordGet') }}">
<i class="far fa fa-key"></i>{{ __('Tukar Katalaluan') }}
</a>
>>>>>>> Stashed changes
</div>
<div class="dropdown-item">
{{-- <a class="far fa fa-key" href="tukarkatalaluan">Tukar Katalaluan</a> --}}
<a class="dropdown-item" href="{{ route('changePasswordGet') }}">
<i class="far fa fa-key"></i>{{ __('Tukar Katalaluan') }}
</a>
>>>>>>> Stashed changes
</div>
<div class="dropdown-item">
{{-- <a class="far fa fa-key" href="tukarkatalaluan">Tukar Katalaluan</a> --}}