mejoras

2025-05-23 00:26:53 +02:00
parent 19fa52ca65
commit 28c225687a
431 changed files with 161955 additions and 2096 deletions
--- a/app/Livewire/ProjectShow.php
+++ b/app/Livewire/ProjectShow.php
@@ -240,16 +240,6 @@ 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' => [
-                ['name' => __('Projects'), 'url' => route('projects.index')],
-                ['name' => $this->project->name, 'url' => route('projects.show', $this->project)],
-            ],
-        ]);
-=======
-        return view('livewire.project-show');
->>>>>>> f97a7a84985ea300216ba3ea2ab4c31306e1659a
+        return view('livewire.project.show');
    }
 }