diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-27 09:17:54 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-27 09:17:54 +0530 |
| commit | bc618b0d535e0e67a7ea845c026678113f000d64 (patch) | |
| tree | 0278236888d47fa8ee189fd82c9e1ab79fd83227 /components/script/dom/websocket.rs | |
| parent | 243bc8b6dd049600562578cefe48505562d0435e (diff) | |
| parent | c36cbf58e8fc3956bb200e4fde7ef7bd5d34c96a (diff) | |
| download | servo-bc618b0d535e0e67a7ea845c026678113f000d64.tar.gz servo-bc618b0d535e0e67a7ea845c026678113f000d64.zip | |
Auto merge of #8689 - jdm:deps, r=frewsxcv
Remove remaining version-conflict exceptions in tidy.py.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8689)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/websocket.rs')
0 files changed, 0 insertions, 0 deletions