Skip to content
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

1036 conflict fix #1051

Merged
merged 5 commits into from
Jun 22, 2017
Merged

1036 conflict fix #1051

merged 5 commits into from
Jun 22, 2017

Conversation

garemoko
Copy link
Contributor

Non-conflicting version of #1036

@andyjohnson
Copy link
Contributor

Thanks, merging as this was agreed upon before, just conflicted and then misplaced.

@andyjohnson andyjohnson merged commit 05d6469 into adlnet:master Jun 22, 2017
@garemoko garemoko deleted the 1036-conflict-fix branch June 22, 2017 14:00
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.

None yet

3 participants