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/app/Livewire/ProjectShow.php
+++ b/app/Livewire/ProjectShow.php
@@ -240,6 +240,7 @@ class ProjectShow extends Component

    public function render()
    {
+<<<<<<< HEAD
        return view('livewire.project.show')->layout('components.layouts.documents', [
            'title' => __('Project: :name', ['name' => $this->project->name]),
            'breadcrumbs' => [
@@ -247,5 +248,8 @@ class ProjectShow extends Component
                ['name' => $this->project->name, 'url' => route('projects.show', $this->project)],
            ],
        ]);
+=======
+        return view('livewire.project-show');
+>>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
    }
 }