Skip to content

Conversation

@joerghuber
Copy link
Contributor

Merge/Replace current A4L master with master from NSIP. This holds the new maven build approach changes.

Joerg Huber added 30 commits May 31, 2016 10:23
@joerghuber
Copy link
Contributor Author

Merge conflict. Retry again after resolution.

@joerghuber joerghuber closed this Dec 20, 2016
@joerghuber
Copy link
Contributor Author

Try to resolve conflict online

@joerghuber joerghuber reopened this Dec 20, 2016
@bencart bencart merged commit 77fe535 into Access4Learning:master Dec 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants