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

docs: remove text from merge conflict resolution #17

Merged
merged 1 commit into from
Aug 9, 2024

Conversation

jcstein
Copy link
Member

@jcstein jcstein commented Aug 7, 2024

Overview

This pr removes what looks like merge conflict text.

@cmwaters cmwaters merged commit 013a149 into celestiaorg:main Aug 9, 2024
2 checks passed
@jcstein jcstein deleted the patch-2 branch August 11, 2024 02:26
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