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