Skip to content

S
sisage
Commit 0fbd82a8 authored by Marcos Vinicius Felix De Sousa da Silva's avatar Marcos Vinicius Felix De Sousa da Silva
Browse files
Options

MERGE

parents 37ca6434 a6e82b25
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
resources/views/auth/login.blade.php
View file @ 0fbd82a8
......@@ -64,7 +64,10 @@
<button type="submit" class="btn btn-enter">
{{ __('agendamento.login') }}
</button>
<<<<<<< HEAD
=======
>>>>>>> a6e82b2566fd5ff1075e6b81014a42e4b3a6f59c
</div>
</div>
......
resources/views/components/page.blade.php
View file @ 0fbd82a8
......@@ -2,15 +2,12 @@
<div class="row justify-content-center">
<div class="col-md-{{$col}}">
<div class="card">
<<<<<<< HEAD
<div class="imaLogos">
<img src="{!! asset('img/Logo governo_150.png') !!}">
</div>
<!-- <div class="card-header">{{ $page }}</div> -->
{{-- <div class="card-header">{{ $page }}</div> --}}
=======
<div class="card-header">{{ $page }}</div>
>>>>>>> 9f9046eedf5ca6cf5a6ac9f6fd3d9ab219337622
<div class="card-body">
{{ $slot }}
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment