Skip to content

Fix up merge mess#2601

Merged
nrc merged 1 commit intorust-lang:masterfrom
topecongiro:fix-merge-mess
Apr 6, 2018
Merged

Fix up merge mess#2601
nrc merged 1 commit intorust-lang:masterfrom
topecongiro:fix-merge-mess

Conversation

@topecongiro
Copy link
Copy Markdown
Contributor

No description provided.

@topecongiro
Copy link
Copy Markdown
Contributor Author

There were conflicts between #2576 and #2599.

@nrc nrc merged commit b6645e3 into rust-lang:master Apr 6, 2018
@nrc
Copy link
Copy Markdown
Member

nrc commented Apr 6, 2018

Thank you!

@topecongiro topecongiro deleted the fix-merge-mess branch April 6, 2018 04:50
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