Resolve conflict in Block.php

laraxot · Feb 5, 2024 · 7ed845b · 7ed845b
1 parent ce90aa4
commit 7ed845b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/View/Components/Render/Block.php b/View/Components/Render/Block.php
@@ -39,6 +39,10 @@ public function render(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vi
         $view = Arr::first($views, static fn (string $view) => view()->exists($view));
         if (null === $view) {
             throw new \Exception('none of these views exists ['.implode(', '.chr(13), $views).']');
+<<<<<<< HEAD
+=======
+            // dddx([$views, $this->model]);
+>>>>>>> 8365272 (conflict)
         }
         $view_params = $this->block['data'] ?? [];