Conserto pagina login

7ede6e44 · Marcos Albano · 0fbd82a8 · 7ede6e44
Commit 7ede6e44 authored Jan 22, 2021 by Marcos Albano 💬
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

login.blade.php resources/views/auth/login.blade.php +0 -4

No files found.
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -64,10 +64,6 @@
                                <button type="submit" class="btn btn-enter">
                                    {{ __('agendamento.login') }}
                                </button>
-<<<<<<< HEAD
-
-=======
->>>>>>> a6e82b2566fd5ff1075e6b81014a42e4b3a6f59c
                            </div>
                        </div>