Skip to content

/ servo

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

Remove file accidentally added in #17219. #17233

Merged
merged 2 commits into from Jun 8, 2017
Merged

Remove file accidentally added in #17219. #17233

merged 2 commits into from Jun 8, 2017
+2 −44

Conversation

@emilio
Copy link
Member

emilio commented Jun 8, 2017 •
edited by larsbergstrom

And prevent it from happening again.

This change is Reviewable
@highfive
Copy link

highfive commented Jun 8, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/values/specified/mod.rs.rej
@highfive
Copy link

highfive commented Jun 8, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@emilio emilio force-pushed the emilio:rej branch from 6f3d257 to 89934b0 Jun 8, 2017
emilio added 2 commits Jun 8, 2017
@emilio
Remove file accidentally added in #17219.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
c9320de 
And prevent it from happening again.
@emilio
Also ignore orig files.
Unverified
This user has not uploaded their public key yet.
GPG key ID: 056B727BB9C1027C Learn about signing commits
Loading status checks…
ea90730
@emilio emilio force-pushed the emilio:rej branch from 89934b0 to ea90730 Jun 8, 2017
@bzbarsky
Copy link
Contributor

bzbarsky commented Jun 8, 2017

@bors-servo r=me
@bzbarsky
Copy link
Contributor

bzbarsky commented Jun 8, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2017

📌 Commit ea90730 has been approved by bzbarsky
@emilio
Copy link
Member Author

emilio commented Jun 8, 2017

@bors-servo r=bzbarsky
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2017

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: #17227
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2017

📌 Commit ea90730 has been approved by bzbarsky
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2017

⌛ Testing commit ea90730 with merge 2a78fae...
bors-servo added a commit that referenced this pull request Jun 8, 2017
@bors-servo
Auto merge of #17233 - emilio:rej, r=bzbarsky
Loading status checks…
2a78fae 
Remove file accidentally added in #17219.

And prevent it from happening again.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17233)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 8, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: bzbarsky
Pushing 2a78fae to master...
@bors-servo bors-servo merged commit ea90730 into servo:master Jun 8, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@upsuper upsuper mentioned this pull request Jun 8, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@metajack metajack

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@emilio @highfive @bzbarsky @bors-servo @metajack
You can’t perform that action at this time.