Skip to content

Commit

Permalink
correctly resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
driusan committed Dec 20, 2022
1 parent 6f6d93d commit ee402e8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Router/BaseRouter.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public function handle(ServerRequestInterface $request) : ResponseInterface

$factory->setBaseURL($baseurl);

$module = $this->lorisinstance->getModule($modulename);
$module = $this->loris->getModule($modulename);
$module->registerAutoloader();

$mr = new ModuleRouter($module);
Expand All @@ -138,7 +138,7 @@ public function handle(ServerRequestInterface $request) : ResponseInterface
$request = $request
->withAttribute("baseurl", $baseurl->__toString())
->withAttribute("CandID", $components[0]);
$module = $this->lorisinstance->getModule("timepoint_list");
$module = $this->loris->getModule("timepoint_list");
$module->registerAutoloader();

$mr = new ModuleRouter($module);
Expand Down

0 comments on commit ee402e8

Please sign in to comment.