remove some faulty data
This commit is contained in:
@@ -81,7 +81,6 @@
|
|||||||
<a href="{{ url('/admin') }}">Admin</a>
|
<a href="{{ url('/admin') }}">Admin</a>
|
||||||
@endif
|
@endif
|
||||||
<a href="{{ url('/user/dashboard') }}">Dashboard</a>
|
<a href="{{ url('/user/dashboard') }}">Dashboard</a>
|
||||||
<<<<<<< HEAD
|
|
||||||
<a href="{!! url('/logout') !!}" class="btn btn-default btn-flat"
|
<a href="{!! url('/logout') !!}" class="btn btn-default btn-flat"
|
||||||
onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
|
onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
|
||||||
Sign out
|
Sign out
|
||||||
@@ -89,9 +88,7 @@
|
|||||||
<form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
|
<form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
|
||||||
{{ csrf_field() }}
|
{{ csrf_field() }}
|
||||||
</form>
|
</form>
|
||||||
=======
|
|
||||||
<a href="{{ url('/logout') }}">Logout</a>
|
<a href="{{ url('/logout') }}">Logout</a>
|
||||||
>>>>>>> #26.1 test
|
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|||||||
Reference in New Issue
Block a user