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.

Sign up for GitHub

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

Jump to bottom

Merge conflict markers in metrics_new branch #2194

Closed
aabmass opened this issue Oct 13, 2021 · 1 comment · Fixed by #2199
Closed

Merge conflict markers in metrics_new branch #2194

aabmass opened this issue Oct 13, 2021 · 1 comment · Fixed by #2199
Assignees
@ocelotl
Labels
metrics

Comments

@aabmass
Copy link
Member

aabmass commented Oct 13, 2021

Found one merge conflict marker <<<<<<< HEAD in CHANGELOG.md from 589ba99

Possibly could be more
@ocelotl ocelotl mentioned this issue Oct 14, 2021
Merged
@ocelotl
Copy link
Contributor

ocelotl commented Nov 2, 2021

Fixed in #2119

@ocelotl ocelotl closed this as completed Nov 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@ocelotl ocelotl

Labels
metrics
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Merge main 2 ocelotl/opentelemetry-python
2 participants
@aabmass @ocelotl