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

Fix changelog from bad merge #716

Merged
merged 1 commit into from
Aug 1, 2017
Merged

Conversation

Susurrus
Copy link
Contributor

Missed this when merging #672.

@asomers
Copy link
Member

asomers commented Jul 31, 2017

bors r+

@Susurrus
Copy link
Contributor Author

Susurrus commented Aug 1, 2017

Hmm, bors never got around to finishing this. Let's try again.

bors r+ asomers

@bors
Copy link
Contributor

bors bot commented Aug 1, 2017

Merge conflict

@Susurrus
Copy link
Contributor Author

Susurrus commented Aug 1, 2017

bors r+ asomers

bors bot added a commit that referenced this pull request Aug 1, 2017
716: Fix changelog from bad merge r=Susurrus

Missed this when merging #672.
@bors
Copy link
Contributor

bors bot commented Aug 1, 2017

@bors bors bot merged commit f808cd2 into nix-rust:master Aug 1, 2017
@Susurrus Susurrus deleted the fix_changelog branch August 1, 2017 23:25
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