New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve action conflicts #1

Open
wants to merge 5 commits into
base: master
from

Conversation

Projects
None yet
1 participant
@smudge202
Collaborator

smudge202 commented Apr 18, 2016

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):

  • Add tests (oops)
  • Undo deletion of global.json
  • Add xml documentation
  • Decrement version number
  • Amend readme docs if appropriate

Smudge202 added some commits Apr 18, 2016

Smudge202
added file versions to mimic build script
may revert this if it proves unnecessary
Smudge202
removed global.json
this resolves a x-compilation issue when building the projects from Gilmond.Api
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment