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

Allow list markers to contain multiple fragments #7041

Merged
merged 1 commit into from Aug 7, 2015

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented Aug 6, 2015

Fixes #6913. r? @pcwalton

Review on Reviewable

@pcwalton
Copy link
Contributor

pcwalton commented Aug 6, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2015

📌 Commit 2ca5df7 has been approved by pcwalton

@jdm
Copy link
Member

jdm commented Aug 6, 2015

No test?

@mbrubeck
Copy link
Contributor Author

mbrubeck commented Aug 6, 2015

No test?

Oh, right. I wasn't able to reproduce this (possibly because of fonts as noted in #6913). If someone who can reproduce the problem can create a reduced test case, we can add it as a reftest.

@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2015

🔒 Merge conflict

@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2015

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

@jdm jdm added S-needs-rebase and removed S-awaiting-merge labels Aug 7, 2015
@mbrubeck mbrubeck force-pushed the mbrubeck:marker_fragments branch from 2ca5df7 to 4e8d2b0 Aug 7, 2015
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Aug 7, 2015

@bors-servo r=pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2015

📌 Commit 4e8d2b0 has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2015

Testing commit 4e8d2b0 with merge 568bd92...

bors-servo pushed a commit that referenced this pull request Aug 7, 2015
Allow list markers to contain multiple fragments

Fixes #6913. r? @pcwalton

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7041)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2, mac3

@bors-servo bors-servo merged commit 4e8d2b0 into servo:master Aug 7, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@mbrubeck mbrubeck deleted the mbrubeck:marker_fragments branch May 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.