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

Remove conflict markers #2130

Merged
merged 1 commit into from
Dec 3, 2019
Merged

Remove conflict markers #2130

merged 1 commit into from
Dec 3, 2019

Conversation

alcaeus
Copy link
Member

@alcaeus alcaeus commented Dec 3, 2019

This removes conflict markers from the sidebar and adds a missing docs section back.

Thanks @TimoBakx for pointing this out to me!

@alcaeus alcaeus requested a review from malarzm December 3, 2019 14:17
@alcaeus alcaeus self-assigned this Dec 3, 2019
malarzm
malarzm approved these changes Dec 3, 2019
View reviewed changes
Copy link
Member

@malarzm malarzm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the conflict stems from my merge up... I'm sorry, blame Amsterdam ;)

@malarzm malarzm merged commit 2e1d0bf into doctrine:master Dec 3, 2019
@alcaeus alcaeus deleted the remove-conflict-markers branch November 27, 2020 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@malarzm malarzm malarzm approved these changes

Assignees

@alcaeus alcaeus

Labels
Documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@alcaeus @malarzm