Another fix

edgebox-iot · Dec 8, 2024 · 3242f01 · 3242f01
1 parent 6d313fc
commit 3242f01
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/src/Repository/OptionRepository.php b/src/src/Repository/OptionRepository.php
@@ -62,14 +62,11 @@ public function findBrowserDevStatus(): ?string
     public function findBrowserDevPassword(): ?string
     {
         return $this->findOption('BROWSERDEV_PASSWORD');
-<<<<<<< Updated upstream
-=======
     }
 
     public function findBrowserDevUrl(): ?string
     {
         return $this->findOption('BROWSERDEV_URL');
->>>>>>> Stashed changes
     }
 
     private function findOption(string $name)