From e3b22335e1bd36ab1f291c0ee2b66dcce3b111e2 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <dave.mcnicoll@cslsj.qc.ca>
Date: Wed, 25 Feb 2026 19:40:07 +0000
Subject: [PATCH] - Merged with master done

---
 src/ApplicationStrategy.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php
index 0b182f4..a25f469 100644
--- 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)*/