From 5839041e4cb3b59a39162b1c46811265955d246d Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <dave.mcnicoll@cslsj.qc.ca>
Date: Thu, 21 May 2026 15:09:20 +0000
Subject: [PATCH] - Fixed conflicts

---
 src/ApplicationStrategy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ApplicationStrategy.php b/src/ApplicationStrategy.php
index 5baa557..d5b833d 100644
--- a/src/ApplicationStrategy.php
+++ b/src/ApplicationStrategy.php
@@ -68,7 +68,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
             }
         };
 <<<<<<< HEAD
-    } 
+    }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
 }
\ No newline at end of file