Skip to content

docs: fix merge error#3991

Merged
jsumners merged 1 commit intomainfrom
docs-fix
Jun 10, 2022
Merged

docs: fix merge error#3991
jsumners merged 1 commit intomainfrom
docs-fix

Conversation

@climba03003
Copy link
Member

The conflict message is added in docs when merging main into next.

Checklist

@github-actions github-actions bot added the documentation Improvements or additions to documentation label Jun 10, 2022
@jsumners jsumners merged commit df3c9c3 into main Jun 10, 2022
@jsumners jsumners deleted the docs-fix branch June 10, 2022 02:05
@github-actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants