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

Fix build #824

Merged
merged 4 commits into from
Jul 28, 2020
Merged

Fix build #824

merged 4 commits into from
Jul 28, 2020

Conversation

trask
Copy link
Member

@trask trask commented Jul 28, 2020

Fix build due to collisions between #723 and #781 and #815

@trask trask marked this pull request as ready for review July 28, 2020 21:53
trask and others added 2 commits July 28, 2020 16:11
…oot-autoconfigure.gradle

Co-authored-by: Munir Abdinur <62392438+mabdinur@users.noreply.github.com>
@trask trask mentioned this pull request Jul 28, 2020
@anuraaga
Copy link
Contributor

Oops accidentally double approved

@trask trask merged commit d107fe5 into open-telemetry:master Jul 28, 2020
@trask trask deleted the fix-build branch July 28, 2020 23:49
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.

3 participants