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

[chore] Fix merge conflict with golden package move #28662

Merged

Conversation

djaglowski
Copy link
Member

This fixes a merge conflict between #28594 and #26475

@djaglowski djaglowski marked this pull request as ready for review October 27, 2023 12:36
@djaglowski djaglowski requested a review from a team October 27, 2023 12:36
@djaglowski djaglowski merged commit 1f646ab into open-telemetry:main Oct 27, 2023
81 checks passed
@github-actions github-actions bot added this to the next release milestone Oct 27, 2023
jmsnll pushed a commit to jmsnll/opentelemetry-collector-contrib that referenced this pull request Nov 12, 2023
RoryCrispin pushed a commit to ClickHouse/opentelemetry-collector-contrib that referenced this pull request Nov 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants