up

laraxot · Jul 9, 2024 · a71139c · a71139c
1 parent f3d434e
commit a71139c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/Datas/AnswersChartData.php b/Datas/AnswersChartData.php
@@ -397,11 +397,7 @@ public function getChartJsDoughnutOptionsJs(string $js): string
         }
         $first_answer = $this->answers->first();
         $label = '--';
-<<<<<<< HEAD
-        if ($first_answer !== null) {
-=======
         if ($first_answer != null) {
->>>>>>> fe9987d44e3b418ea86a93b61dddb76d3131a2f8
             Assert::isInstanceOf($first_answer, AnswerData::class, '['.__LINE__.']['.__FILE__.']');
             $label = round((float) $this->answers->first()->avg, 2);
         }

diff --git a/Filament/Widgets/Samples/OverlookV2Widget.php b/Filament/Widgets/Samples/OverlookV2Widget.php
@@ -107,10 +107,6 @@ public function getData(): array
                     'url' => $res->getUrl('index'),
                 ];
             }
-<<<<<<< HEAD
-
-=======
->>>>>>> fe9987d44e3b418ea86a93b61dddb76d3131a2f8
         })
             ->filter()
             // ->when($plugin->shouldSortAlphabetical(), fn ($collection) => $collection->sortBy('name'))