no message

resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php

@@ -43,13 +43,7 @@
                                 <li class="user-header">
                                     {{--<img src="{{ Gravatar::get($user->email) }}" class="img-circle" alt="User Image" />--}}
                                     <p>
-<<<<<<< HEAD
-                                        <img src="img/{{ Auth::user()->foto }}" class="img-circle" alt="User Image" />
-
-=======
                                         <img src="/img/{{ Auth::user()->foto }}" class="img-circle" alt="User Image" />
-                                        
->>>>>>> 97bbeff761f5f7a38a7c0e5eea39fa7bce170bdc
                                     </p>
                                 </li>
                                 <!-- Menu Body -->