ripristinato conflitti
This commit is contained in:
parent
8f5ccad560
commit
3dc54235c5
@ -51,18 +51,7 @@
|
||||
Progetti <span class="fa arrow"></span></a></li>
|
||||
|
||||
@endcan
|
||||
@can('gruppi')
|
||||
<li><a href="{{ route('gruppi'); }}"><i class="fa fa-group fa-fw"></i>
|
||||
Gruppi <span class="fa arrow"></span></a></li>
|
||||
@endcan
|
||||
@can('rivista')
|
||||
<li><a href="{{ route('rivista'); }}"><i class="fa fa-newspaper-o fa-fw"></i>
|
||||
Rivista <span class="fa arrow"></span></a></li>
|
||||
@endcan
|
||||
@can('associazione')
|
||||
<li><a href="{{ route('associazione'); }}"><i class="fa fa-black-tie fa-fw"></i>
|
||||
Associazione <span class="fa arrow"></span></a></li>
|
||||
@endcan
|
||||
|
||||
@can('amministrazione')
|
||||
<li><a href="#"><i class="fa fa-gears fa-fw"></i>Amministrazione<span
|
||||
class="fa arrow"></span></a>
|
||||
@ -73,13 +62,8 @@
|
||||
<li><a class="active" href="/admin/users/newPermission">Permessi</a></li>
|
||||
-->
|
||||
<li><a class="active" href="/admin/users/givepermission">Assegna Permessi</a></li>
|
||||
<<<<<<< HEAD
|
||||
<!--
|
||||
<li><a href="/login">Login Page</a></li>
|
||||
=======
|
||||
<!--
|
||||
<li><a href="/login">Login Page</a></li>
|
||||
>>>>>>> 7a85f2280afa53ac016b540da1f9b547b40b3e42
|
||||
-->
|
||||
</ul> <!-- /.nav-second-level --></li>
|
||||
@endcan
|
||||
|
Loading…
Reference in New Issue
Block a user