iszuddin/git-course
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed missed conflict

Browse Source
This commit is contained in:
Iszuddin Ismail
2026-05-11 12:04:56 +08:00
parent 3b1f50b96d
commit b0eef8fca1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/layouts/navigation.blade.php
View File

@@ -76,13 +76,11 @@
<x-responsive-nav-link :href="route('dashboard')" :active="request()->routeIs('dashboard')"> <x-responsive-nav-link :href="route('dashboard')" :active="request()->routeIs('dashboard')">
{{ __('Dashboard') }} {{ __('Dashboard') }}
</x-responsive-nav-link> </x-responsive-nav-link>
<<<<<<< HEAD
<x-responsive-nav-link :href="route('user.index')" :active="request()->routeIs('user.index')"> <x-responsive-nav-link :href="route('user.index')" :active="request()->routeIs('user.index')">
{{ __('Users') }} {{ __('Users') }}
======= </x-responsive-nav-link>
<x-responsive-nav-link :href="route('role.index')" :active="request()->routeIs('role.index')"> <x-responsive-nav-link :href="route('role.index')" :active="request()->routeIs('role.index')">
{{ __('Roles') }} {{ __('Roles') }}
>>>>>>> role-module
</x-responsive-nav-link> </x-responsive-nav-link>
</div> </div>