- Fixed conflicts

2026-05-21 15:09:20 +00:00 · 2026-05-21 15:09:20 +00:00 · 5839041e4c
commit 5839041e4c
parent c8f4e181be
1 changed files with 1 additions and 1 deletions
--- 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)*/
 }