Merge branch 'main' of https://homehud.duckdns.org/javier/Nexora

2025-05-07 00:21:14 +02:00
parent 655ea60d6b f97a7a8498
commit 19fa52ca65
11 changed files with 378 additions and 0 deletions
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -17,7 +17,10 @@
        </div>

        <!-- Barra de herramientas principal -->
+<<<<<<< HEAD
        javi
+=======
+>>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
        

        <!-- Componente principal Livewire -->