- Fixed conflicts

2026-05-21 15:09:20 +00:00 · 2026-05-21 15:09:20 +00:00 · 538e0b9aec
commit 538e0b9aec
parent 7bad9a69c9
2 changed files with 3 additions and 21 deletions
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@ -67,6 +67,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
                return $this->di->get('error.404');
            }
        };
+<<<<<<< HEAD
    }

 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
--- a/view/lean/picto/undraw_error.phtml
+++ b/view/lean/picto/undraw_error.phtml