diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-01 18:03:57 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-01 18:03:57 +0530 |
| commit | 7ea01868fcb81d5b42a33eb6989ef8c044114430 (patch) | |
| tree | a14b4f23f6a0bba47b23e725269be2e6125145a7 /tests/wpt/web-platform-tests/tools/pytest/doc/en/conftest.py | |
| parent | 95819a4334526751168de0b9868dbd76e27b0d57 (diff) | |
| parent | 78369e95cf7ed0813cb9342747caa4984ae7c527 (diff) | |
| download | servo-7ea01868fcb81d5b42a33eb6989ef8c044114430.tar.gz servo-7ea01868fcb81d5b42a33eb6989ef8c044114430.zip | |
Auto merge of #10315 - jgraham:update-wpt, r=Ms2ger
Update web-platform-tests to 5582e4d2bfcfd1fa9f105406b143170ee2af7db1
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10315)
<!-- Reviewable:end -->
Diffstat (limited to 'tests/wpt/web-platform-tests/tools/pytest/doc/en/conftest.py')
| -rw-r--r-- | tests/wpt/web-platform-tests/tools/pytest/doc/en/conftest.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/wpt/web-platform-tests/tools/pytest/doc/en/conftest.py b/tests/wpt/web-platform-tests/tools/pytest/doc/en/conftest.py new file mode 100644 index 00000000000..1a62e1b5df5 --- /dev/null +++ b/tests/wpt/web-platform-tests/tools/pytest/doc/en/conftest.py @@ -0,0 +1 @@ +collect_ignore = ["conf.py"] |