merge user dan role conflict resolved
This commit is contained in:
@@ -17,6 +17,8 @@
|
||||
</x-nav-link>
|
||||
<x-nav-link :href="route('users.index')" :active="request()->routeIs('users.index')">
|
||||
{{ __('Users') }}
|
||||
<x-nav-link :href="route('roles.index')" :active="request()->routeIs('roles.index')">
|
||||
{{ __('Roles') }}
|
||||
</x-nav-link>
|
||||
</div>
|
||||
</div>
|
||||
@@ -75,6 +77,8 @@
|
||||
</x-responsive-nav-link>
|
||||
<x-responsive-nav-link :href="route('users.index')" :active="request()->routeIs('users.index')">
|
||||
{{ __('Users') }}
|
||||
<x-responsive-nav-link :href="route('roles.index')" :active="request()->routeIs('roles.index')">
|
||||
{{ __('Roles') }}
|
||||
</x-responsive-nav-link>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user