- Fixed conflicts

src/ApplicationStrategy.php

@@ -68,7 +68,7 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
             }
         };
 <<<<<<< HEAD
-    } 
+    }
 
 >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/
 }