Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
Fix Railgun crash and minor projectile optimizations #16536
To be honest, as far as I can tell in most places that would either have been counterproductive (in lines that auto-resolve should be able to handle), or wouldn't help (lines that would still conflict for different reasons, like inserted empty lines or removed [Sync] attribute etc.).
If you think there are more places that would really not conflict anymore if I updated them, please point them out.