fix: resolver conflicto de merge en header y agregar CSRF token a axios

- Resuelve marcadores de conflicto dejados en header.blade.php
- Agrega X-CSRF-TOKEN a los headers por defecto de axios (evita 419 en endpoints de notificaciones)
- Rebuild de assets de Vite

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

public/build/manifest.json

@@ -9,7 +9,7 @@
     ]
   },
   "resources/js/app.js": {
-    "file": "assets/app-4EiGmH4n.js",
+    "file": "assets/app-DAN06vjJ.js",
     "name": "app",
     "src": "resources/js/app.js",
     "isEntry": true

resources/js/bootstrap.js

@@ -4,4 +4,9 @@ window.axios = axios;
 
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
+const csrfToken = document.querySelector('meta[name="csrf-token"]')?.getAttribute('content');
+if (csrfToken) {
+    window.axios.defaults.headers.common['X-CSRF-TOKEN'] = csrfToken;
+}
+
 import './echo';

resources/views/layouts/_partials/header.blade.php

@@ -146,13 +146,11 @@
                 <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button"
                     data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="mr-2 d-none d-lg-inline text-gray-600 small">{{ Auth::user()->name }}</span>
-<<<<<<< Updated upstream
-                    <img class="img-profile rounded-circle" src="{{ Auth::user()->profile_photo_url }}">
-=======
-                        {{-- <img class="img-profile rounded-circle"
+
+                    {{-- <img class="img-profile rounded-circle" src="{{ Auth::user()->profile_photo_url }}"> --}}
+                        <img class="img-profile rounded-circle"
                             src="{{ Auth::user()->profile_photo_url }}"
-                            alt="{{ Auth::user()->name }}"> --}}
->>>>>>> Stashed changes
+                            alt="{{ Auth::user()->name }}">
                 </a>
                 <div class="dropdown-menu dropdown-menu-right shadow animated--grow-in"
                     aria-labelledby="userDropdown">