Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Resolve action conflicts #1
I've added code to assist in resolving action conflicts. Note, I also had to override mvc 6 routing. I'm going to blog about it, but the override code is available on the respective internal project (for Gilmond).
@shaundodimead want to check this over. I know the following needs doing (should not be merged until complete):