Skip to content

Conversation

AlisdairO
Copy link
Contributor

As title :-)
Part of #24407.

r? @Manishearth

This will need merging with E0193, so probably want to delay any r+ until that goes in and I can merge myself.

@bors
Copy link
Collaborator

bors commented Aug 11, 2015

☔ The latest upstream changes (presumably #27658) made this pull request unmergeable. Please resolve the merge conflicts.

@AlisdairO
Copy link
Contributor Author

OK, rebased appropriately.

@Manishearth
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 11, 2015

📌 Commit fef60c0 has been approved by Manishearth

Manishearth added a commit to Manishearth/rust that referenced this pull request Aug 11, 2015
…arth

 As title :-)
Part of rust-lang#24407.

r? @Manishearth

This will need merging with E0193, so probably want to delay any r+ until that goes in and I can merge myself.
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Aug 12, 2015
As title :-)
Part of rust-lang#24407.

r? @Manishearth

This will need merging with E0193, so probably want to delay any r+ until that goes in and I can merge myself.
@bors bors merged commit fef60c0 into rust-lang:master Aug 12, 2015
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.

3 participants