- Merged with master done

2026-02-25 19:40:07 +00:00 · 2026-02-25 19:40:07 +00:00 · e3b22335e1
commit e3b22335e1
parent 6cb5e7bba8
1 changed files with 2 additions and 2 deletions
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@ -66,8 +66,8 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {

                return $this->di->get('error.404');
            }
-        };
-<<<<<<< HEAD 
+        }; 
+<<<<<<< HEAD
    }

 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/