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

[iostream.objects.overview] Delete duplicate paragraph. #4230

Merged
merged 1 commit into from Sep 24, 2020

Conversation

tkoeppe
Copy link
Contributor

@tkoeppe tkoeppe commented Sep 24, 2020

Initially, 75bea3c moved a footnote into a new "recommended practice" paragraph. Later, cb07613 added the same "recommended practice" into the middle of the paragraph that originally contained the footnote.

Initial edit: 75bea3c#diff-8d76c9854d3e844d443d7516819ba062

Bogus duplication: cb07613#diff-8d76c9854d3e844d443d7516819ba062

Initially, 75bea3c moved a footnote
into a new "recommended practice" paragraph. Later,
cb07613 added the same "recommended
practice" into the middle of the paragraph that originally contained
the footnote.
@jensmaurer
Copy link
Member

That's rebase bug, thanks for catching.

@tkoeppe
Copy link
Contributor Author

tkoeppe commented Sep 24, 2020

I figured :-) I found it during the commit reordering.

@tkoeppe tkoeppe merged commit 6608a61 into cplusplus:master Sep 24, 2020
@tkoeppe tkoeppe deleted the dedup branch September 24, 2020 17:16
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.

None yet

2 participants